diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-11 20:39:53 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-11 20:39:53 +0000 |
| commit | 43de653336d3332ea574edca29228e7a931c3886 (patch) | |
| tree | 7e5f3fba4178899ab1c4cf8143bb0b5d8decf8b8 /packages/imlib2/imlib2-1.1.0/cross.patch | |
| parent | 307aa2ae742c860ce1f9a1d41c568e054ad670a9 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/05/11 21:43:37+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/05/11 18:50:47+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/05/11 18:50:19+02:00 uni-frankfurt.de!mickeyl
unbreak ewl and move to using releases
2005/05/11 18:44:46+02:00 uni-frankfurt.de!mickeyl
move etox to using releases
2005/05/11 18:41:01+02:00 uni-frankfurt.de!mickeyl
unbreak edje and move over to using releases
2005/05/11 18:39:11+02:00 uni-frankfurt.de!mickeyl
enable ecore-dbus and ecore-file libraries
2005/05/11 17:57:28+02:00 uni-frankfurt.de!mickeyl
unbreak imlib2 and switch to using releases
2005/05/11 17:42:25+02:00 uni-frankfurt.de!mickeyl
move embryo to using the release version
2005/05/11 17:39:15+02:00 uni-frankfurt.de!mickeyl
move ecore and evas to releases and unbreak it
2005/05/11 17:09:40+02:00 uni-frankfurt.de!mickeyl
unbreak edb and eet, move to releases, and remove maintainers that don't maintain
BKrev: 42826d99O_aJh416yx1aCKD6PTS1Yw
Diffstat (limited to 'packages/imlib2/imlib2-1.1.0/cross.patch')
| -rw-r--r-- | packages/imlib2/imlib2-1.1.0/cross.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/packages/imlib2/imlib2-1.1.0/cross.patch b/packages/imlib2/imlib2-1.1.0/cross.patch index e69de29bb2..bb4ed1784d 100644 --- a/packages/imlib2/imlib2-1.1.0/cross.patch +++ b/packages/imlib2/imlib2-1.1.0/cross.patch @@ -0,0 +1,74 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- imlib2-1.1.0/demo/Makefile.am~cross ++++ imlib2-1.1.0/demo/Makefile.am +@@ -8,8 +8,7 @@ + LDFLAGS = -L/usr/X11R6/lib + INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \ + -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \ +- -I/usr/X11R6/include $(X_CFLAGS) \ +- -I$(prefix)/include -I$(includedir) ++ $(X_CFLAGS) + + bin_PROGRAMS = imlib2_view imconvert + imconvert_SOURCES = imconvert.c +--- imlib2-1.1.0/filters/Makefile.am~cross ++++ imlib2-1.1.0/filters/Makefile.am +@@ -8,8 +8,7 @@ + LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib + INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \ + -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \ +- -I/usr/X11R6/include $(X_CFLAGS) \ +- -I$(prefix)/include -I$(includedir) ++ $(X_CFLAGS) + + pkgdir = $(libdir)/loaders/filter + pkg_LTLIBRARIES = testfilter.la bump_map.la colormod.la +--- imlib2-1.1.0/loaders/Makefile.am~cross ++++ imlib2-1.1.0/loaders/Makefile.am +@@ -8,8 +8,7 @@ + LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib + INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \ + -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \ +- -I/usr/X11R6/include $(X_CFLAGS) \ +- -I$(prefix)/include -I$(includedir) ++ $(X_CFLAGS) + + pkgdir = $(libdir)/loaders/image + +--- imlib2-1.1.0/src/Makefile.am~cross ++++ imlib2-1.1.0/src/Makefile.am +@@ -8,8 +8,7 @@ + LDFLAGS = -L/usr/X11R6/lib + INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \ + -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \ +- $(freetype_cflags) -I/usr/X11R6/include $(X_CFLAGS) \ +- -I$(prefix)/include -I$(includedir) ++ $(freetype_cflags) $(X_CFLAGS) + MMX_SRCS = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S \ + asm_blend_cmod.S + MMX_OBJS = $(MMX_SRCS:.S=.lo) +@@ -42,7 +41,7 @@ + libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS) + endif + +-SYS_LOADERS_PATH = @pkglibdir@ ++SYS_LOADERS_PATH = @loadersdir@ + image.lo: loaderpath.h + loaderpath.h: Makefile + @echo "#define SYS_LOADERS_PATH \"${SYS_LOADERS_PATH}\"" > $@ +--- imlib2-1.1.0/test/Makefile.am~cross ++++ imlib2-1.1.0/test/Makefile.am +@@ -8,8 +8,7 @@ + LDFLAGS = -L/usr/X11R6/lib + INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \ + -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \ +- -I/usr/X11R6/include $(X_CFLAGS) \ +- -I$(prefix)/include -I$(includedir) ++ $(X_CFLAGS) + + bin_PROGRAMS = imlib2 bumpmaptest imlib2_test polytest color_spaces + imlib2_SOURCES = main.c |