karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

evas: Updated (1.0.0.beta -> 1.0.0)

user/chris/test/early-mdev
Alejandro Mery 14 years ago
parent
070345b718
commit
b0d28f1f25
3 changed files with 6 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 76
      e17/evas/evas-1.0.0.beta-X11-check_engine.patch
  2. 10
      e17/evas/evas.conf
  3. 6
      e17/evas/evas.desc

76
e17/evas/evas-1.0.0.beta-X11-check_engine.patch
Unescape View File

@ -1,76 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../evas/evas-1.0.0.beta-X11-check_engine.patch
# Copyright (C) 2010 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Description: Fix X11 related configure test by using the X11 library path
--- evas-1.0.0.beta/m4/evas_check_engine.m4.orig 2010-10-04 14:21:05.496000908 +0200
+++ evas-1.0.0.beta/m4/evas_check_engine.m4 2010-10-04 14:59:09.580000847 +0200
@@ -34,11 +34,11 @@ AC_PATH_XTRA
AC_CHECK_HEADER([X11/X.h], [have_dep="yes"])
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([X11], [XCreateImage], [have_dep="yes"], [have_dep="no"])
+ AC_CHECK_LIB([X11], [XCreateImage], [have_dep="yes"], [have_dep="no"], -L${x_libraries})
fi
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([Xext], [XShmCreateImage], [have_dep="yes"], [have_dep="no"])
+ AC_CHECK_LIB([Xext], [XShmCreateImage], [have_dep="yes"], [have_dep="no"], -L${x_libraries})
fi
if test "x${have_dep}" = "xyes" ; then
@@ -80,15 +80,15 @@ AC_CHECK_HEADERS([X11/X.h X11/extensions
[have_dep="no"])
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([X11], [XCreateImage], [have_dep="yes"], [have_dep="no"])
+ AC_CHECK_LIB([X11], [XCreateImage], [have_dep="yes"], [have_dep="no"], -L${x_libraries})
fi
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([Xext], [XShmCreateImage], [have_dep="yes"], [have_dep="no"])
+ AC_CHECK_LIB([Xext], [XShmCreateImage], [have_dep="yes"], [have_dep="no"], -L${x_libraries})
fi
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([Xrender], [XRenderCreatePicture], [have_dep="yes"], [have_dep="no"])
+ AC_CHECK_LIB([Xrender], [XRenderCreatePicture], [have_dep="yes"], [have_dep="no"], -L${x_libraries})
fi
if test "x${have_dep}" = "xyes" ; then
@@ -130,7 +130,7 @@ AC_CHECK_HEADERS([GL/gl.h GL/glx.h X11/X
[have_dep="no"])
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([X11], [XCreateColormap], [have_dep="yes"], [have_dep="no"])
+ AC_CHECK_LIB([X11], [XCreateColormap], [have_dep="yes"], [have_dep="no"], -L${x_libraries})
fi
if test "x${have_dep}" = "xyes" ; then
@@ -709,11 +709,11 @@ AC_PATH_XTRA
AC_CHECK_HEADER([X11/X.h], [have_dep="yes"])
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([X11], [XCreateImage], [have_dep="yes"], [have_dep="no"])
+ AC_CHECK_LIB([X11], [XCreateImage], [have_dep="yes"], [have_dep="no"], -L${x_libraries})
fi
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([Xext], [XShmCreateImage], [have_dep="yes"], [have_dep="no"])
+ AC_CHECK_LIB([Xext], [XShmCreateImage], [have_dep="yes"], [have_dep="no"], -L${x_libraries})
fi
if test "x${have_dep}" = "xyes" ; then

10
e17/evas/evas.conf
Unescape View File

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../evas/evas.conf
# Copyright (C) 2006 - 2010 The OpenSDE Project
# Copyright (C) 2006 - 2011 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2004 Clifford Wolf
#
@ -45,10 +45,8 @@ fi
# check for xorg
if pkginstalled xorg-server ; then
var_append confopt " " "--x-includes=$( pkgprefix includedir xorg-server )"
var_append confopt " " "--x-libraries=$( pkgprefix libdir xorg-server )"
var_append LDFLAGS ' ' "-L$( pkgprefix -r libdir xorg-server )"
export LDFLAGS
var_append confopt " " "--x-includes=$( pkgprefix -r includedir xorg-server )"
var_append confopt " " "--x-libraries=$( pkgprefix -r libdir xorg-server )"
fi
# check if we can enable the OpenGL X11 display engine
@ -60,8 +58,6 @@ if pkginstalled cairo ; then
var_append GCC_WRAPPER_APPEND ' ' "`pkg-config cairo --cflags`"
fi
var_append GCC_WRAPPER_APPEND ' ' "-I$includedir"
if pkginstalled fontconfig ; then
pkgprefix -t fontconfig
var_append confopt ' ' "--enable-fontconfig"

6
e17/evas/evas.desc
Unescape View File

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../evas/evas.desc
[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2004 Clifford Wolf
[COPY]
@ -32,7 +32,7 @@
[L] GPL
[S] Beta
[V] 1.0.0.beta
[V] 1.0.0
[P] X -?---5---9 201.000
[D] 1155332405 evas-1.0.0.beta.tar.bz2 http://download.enlightenment.org/releases/
[D] 3748026141 evas-1.0.0.tar.bz2 http://download.enlightenment.org/releases/

Write Preview
Loading…
Cancel
Save