diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/directfb/directfb.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-graphics/directfb/directfb/directfb-1.2.x-fix-pkgconfig-cflags.patch | 48 |
2 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index cff8a7f312..97a4c550df 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc | |||
| @@ -14,7 +14,6 @@ DEPENDS = "jpeg libpng freetype zlib tslib" | |||
| 14 | INC_PR = "r0" | 14 | INC_PR = "r0" |
| 15 | 15 | ||
| 16 | SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \ | 16 | SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \ |
| 17 | file://directfb-1.2.x-fix-pkgconfig-cflags.patch \ | ||
| 18 | file://configurefix.patch \ | 17 | file://configurefix.patch \ |
| 19 | file://mesa9.patch" | 18 | file://mesa9.patch" |
| 20 | 19 | ||
diff --git a/meta/recipes-graphics/directfb/directfb/directfb-1.2.x-fix-pkgconfig-cflags.patch b/meta/recipes-graphics/directfb/directfb/directfb-1.2.x-fix-pkgconfig-cflags.patch deleted file mode 100644 index ee60718f1c..0000000000 --- a/meta/recipes-graphics/directfb/directfb/directfb-1.2.x-fix-pkgconfig-cflags.patch +++ /dev/null | |||
| @@ -1,48 +0,0 @@ | |||
| 1 | directfb: Get this patch from Openembedded | ||
| 2 | |||
| 3 | Upstream-Status: Inappropriate [configuration] | ||
| 4 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | ||
| 5 | |||
| 6 | diff -Nur DirectFB-1.4.15/directfb-internal.pc.in DirectFB-1.4.15.new//directfb-internal.pc.in | ||
| 7 | --- DirectFB-1.4.15/directfb-internal.pc.in 2011-09-29 17:51:21.000000000 +0800 | ||
| 8 | +++ DirectFB-1.4.15.new//directfb-internal.pc.in 2011-11-03 15:14:37.000000000 +0800 | ||
| 9 | @@ -2,10 +2,10 @@ | ||
| 10 | exec_prefix=@exec_prefix@ | ||
| 11 | moduledir=@MODULEDIR@ | ||
| 12 | moduledirname=@MODULEDIRNAME@ | ||
| 13 | -includedir=@INTERNALINCLUDEDIR@ | ||
| 14 | +includedir=@includedir@ | ||
| 15 | |||
| 16 | Name: DirectFB-Internal | ||
| 17 | Description: Third party module support package for DirectFB. | ||
| 18 | Version: @VERSION@ | ||
| 19 | Requires: directfb = @VERSION@ | ||
| 20 | -Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@ | ||
| 21 | +Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir} | ||
| 22 | diff -Nur DirectFB-1.4.15/directfb.pc.in DirectFB-1.4.15.new//directfb.pc.in | ||
| 23 | --- DirectFB-1.4.15/directfb.pc.in 2011-09-29 17:51:21.000000000 +0800 | ||
| 24 | +++ DirectFB-1.4.15.new//directfb.pc.in 2011-11-03 15:15:55.000000000 +0800 | ||
| 25 | @@ -9,4 +9,4 @@ | ||
| 26 | Requires: @DEP_VOODOO@ fusion direct | ||
| 27 | Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@ | ||
| 28 | Libs.private: -L${libdir} @LIBM@ @DYNLIB@ @ZLIB_LIBS@ | ||
| 29 | -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ | ||
| 30 | +Cflags: @THREADFLAGS@ -I${includedir}/directfb | ||
| 31 | diff -Nur DirectFB-1.4.15/lib/fusion/fusion.pc.in DirectFB-1.4.15.new//lib/fusion/fusion.pc.in | ||
| 32 | --- DirectFB-1.4.15/lib/fusion/fusion.pc.in 2011-09-29 17:51:21.000000000 +0800 | ||
| 33 | +++ DirectFB-1.4.15.new//lib/fusion/fusion.pc.in 2011-11-03 15:16:46.000000000 +0800 | ||
| 34 | @@ -8,4 +8,4 @@ | ||
| 35 | Version: @VERSION@ | ||
| 36 | Requires: direct | ||
| 37 | Libs: -L${libdir} -lfusion | ||
| 38 | -Cflags: -I@INCLUDEDIR@ | ||
| 39 | +Cflags: -I${includedir}/directfb -I${includedir} | ||
| 40 | diff -Nur DirectFB-1.4.15/lib/voodoo/voodoo.pc.in DirectFB-1.4.15.new//lib/voodoo/voodoo.pc.in | ||
| 41 | --- DirectFB-1.4.15/lib/voodoo/voodoo.pc.in 2011-09-29 17:51:21.000000000 +0800 | ||
| 42 | +++ DirectFB-1.4.15.new//lib/voodoo/voodoo.pc.in 2011-11-03 15:17:34.000000000 +0800 | ||
| 43 | @@ -8,4 +8,4 @@ | ||
| 44 | Version: @VERSION@ | ||
| 45 | Requires: direct | ||
| 46 | Libs: -L${libdir} -lvoodoo | ||
| 47 | -Cflags: -I@INCLUDEDIR@ | ||
| 48 | +Cflags: -I${includedir}/directfb -I${includedir} | ||
