diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-06-04 18:01:16 +0000 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-06-04 18:01:16 +0000 |
commit | 88a650c99fe1e36f4af6974c2332c7127db43882 (patch) | |
tree | b32efa490177666f0e722118d99733fe3a8b1d2b /patches | |
parent | 2fff010765f56e15e7e61d85ee1bc77f75abb1c5 (diff) | |
download | ptxdist-88a650c99fe1e36f4af6974c2332c7127db43882.tar.gz ptxdist-88a650c99fe1e36f4af6974c2332c7127db43882.tar.xz |
* DirectFB-1.0.1/generic:
new
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8344 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches')
-rw-r--r-- | patches/DirectFB-1.0.1/generic/add-acsubst-ld.diff | 24 | ||||
-rw-r--r-- | patches/DirectFB-1.0.1/generic/directfb-config_add-sysroot.diff | 52 | ||||
-rw-r--r-- | patches/DirectFB-1.0.1/generic/series | 2 |
3 files changed, 78 insertions, 0 deletions
diff --git a/patches/DirectFB-1.0.1/generic/add-acsubst-ld.diff b/patches/DirectFB-1.0.1/generic/add-acsubst-ld.diff new file mode 100644 index 000000000..2b7ff265c --- /dev/null +++ b/patches/DirectFB-1.0.1/generic/add-acsubst-ld.diff @@ -0,0 +1,24 @@ +Subject: add AC_SUBST(LD) to configure.in +From: Marc Kleine-Budde <mkl@pengutronix.de> + +$(LD) is used in Makefile.am, but when using libtool $(LD) sems not to +substituted automatically. This patch adds the missing AC_SUBST(). + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> + +--- + configure.in | 1 + + 1 file changed, 1 insertion(+) + +Index: DirectFB-1.0.1/configure.in +=================================================================== +--- DirectFB-1.0.1.orig/configure.in ++++ DirectFB-1.0.1/configure.in +@@ -82,6 +82,7 @@ AC_PROG_CC + ifdef([AM_PROG_AS],[AM_PROG_AS],[]) + AM_PROG_LIBTOOL + AM_SANITY_CHECK ++AC_SUBST(LD) + AC_ISC_POSIX + AC_PROG_INSTALL + AC_PROG_MAKE_SET diff --git a/patches/DirectFB-1.0.1/generic/directfb-config_add-sysroot.diff b/patches/DirectFB-1.0.1/generic/directfb-config_add-sysroot.diff new file mode 100644 index 000000000..f4404d358 --- /dev/null +++ b/patches/DirectFB-1.0.1/generic/directfb-config_add-sysroot.diff @@ -0,0 +1,52 @@ +From: Marc Kleine-Budde <mkl@pengutronix.de> +Subject: teach directfb-config sysroot + +This patches teaches directfb-config about sysroot + + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> + +--- + directfb-config.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +Index: DirectFB-1.0.1/directfb-config.in +=================================================================== +--- DirectFB-1.0.1.orig/directfb-config.in ++++ DirectFB-1.0.1/directfb-config.in +@@ -159,7 +159,7 @@ while test $# -gt 0; do + echo_imageprovider="$echo_imageprovider $moduledir/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_$i.o" + case $i in + imlib2) +- echo_imageprovider="$echo_imageprovider -lImlib2 -lttf -lm -L/usr/X11R6/lib -lXext -lX11" ++ echo_imageprovider="$echo_imageprovider -lImlib2 -lttf -lm -lXext -lX11" + ;; + jpeg) + echo_imageprovider="$echo_imageprovider -ljpeg" +@@ -224,7 +224,7 @@ fi + + if test "$echo_cflags" = "yes"; then + if test @INCLUDEDIR@ != /usr/include ; then +- cflags="-I@INCLUDEDIR@" ++ cflags="-I${SYSROOT}@INCLUDEDIR@" + fi + echo $cflags @THREADFLAGS@ + fi +@@ -272,7 +272,7 @@ if test -n "$echo_wm"; then + fi + + if test -n "$echo_fusionsound"; then +- echo -L$moduledir/interfaces/IFusionSound $echo_fusionsound ++ echo -L${SYSROOT}$moduledir/interfaces/IFusionSound $echo_fusionsound + fi + + +@@ -297,7 +297,7 @@ if test -n "$echo_voodoo"; then + fi + + if test "$echo_libs" = "yes"; then +- libs=-L@libdir@ ++ libs=-L${SYSROOT}@libdir@ + + if test "$lib_directfb" = "yes"; then + libs="$libs -ldirectfb -lfusion -ldirect @THREADLIB@ @ZLIB_LIBS@" diff --git a/patches/DirectFB-1.0.1/generic/series b/patches/DirectFB-1.0.1/generic/series index 091ce04c0..98259a354 100644 --- a/patches/DirectFB-1.0.1/generic/series +++ b/patches/DirectFB-1.0.1/generic/series @@ -1 +1,3 @@ fix-PAGE_SIZE.diff +add-acsubst-ld.diff +directfb-config_add-sysroot.diff |