[oe-commits] org.oe.dev directfb: fixing stuff and update to version 1.1.1
woglinde2 commit
oe at amethyst.openembedded.net
Thu Jul 17 19:51:54 UTC 2008
directfb: fixing stuff and update to version 1.1.1
* add Version 1.1.1, but for now let it not be the default version
* add ts_lib_autools.patch so directfb builds with newer libts
* fix serval .pc files so they has useful entries
Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: e07ea8506d3c48b797607d8f49339c4ac605d045
ViewMTN: http://monotone.openembedded.org/revision/info/e07ea8506d3c48b797607d8f49339c4ac605d045
Files:
1
packages/directfb/directfb_1.1.0.bb
packages/directfb/directfb_1.1.1.bb
packages/directfb/directfb-1.1.0
packages/directfb/directfb-1.1.1
packages/directfb/directfb-1.1.0/fix-pkgconfig-cflags.patch
packages/directfb/directfb-1.1.1/fix-pkgconfig-cflags.patch
packages/directfb/files/ts_lib_autotools.patch
packages/directfb/directfb.inc
packages/directfb/directfb_1.0.0.bb
Diffs:
#
# mt diff -ra8473c5c43fd8bc142d89d552d39648ffbd85c4f -re07ea8506d3c48b797607d8f49339c4ac605d045
#
#
#
# rename "packages/directfb/directfb_1.1.0.bb"
# to "packages/directfb/directfb_1.1.1.bb"
#
# add_dir "packages/directfb/directfb-1.1.0"
#
# add_dir "packages/directfb/directfb-1.1.1"
#
# add_file "packages/directfb/directfb-1.1.0/fix-pkgconfig-cflags.patch"
# content [464f9e278097273487073221ea710e606f92bc6c]
#
# add_file "packages/directfb/directfb-1.1.1/fix-pkgconfig-cflags.patch"
# content [7eb9f5067ab77fa58b944af9d2fe6a8d40866b63]
#
# add_file "packages/directfb/directfb_1.1.0.bb"
# content [cc54936579ba85e537fe3cbbc8eb7aa50d205d08]
#
# add_file "packages/directfb/files/ts_lib_autotools.patch"
# content [28ac46a6b96a520fe67bbb107d29ffca07fab547]
#
# patch "packages/directfb/directfb.inc"
# from [7636873a711a2ff73ab22ef51689749ae798bcee]
# to [4563eb9b40a7a1dbf5bdc129a16d536619b1347d]
#
# patch "packages/directfb/directfb_1.0.0.bb"
# from [e52d09cf53e4d6a09fdffe006f662714b7877cb3]
# to [32e695c23d072d270a64f07b79f94a54a7b70657]
#
# patch "packages/directfb/directfb_1.1.1.bb"
# from [0cf2dec34724035cfe2a2d74dcd2a885943f13b7]
# to [2d3add3ec1b53538f6ff50763d4c32884b226774]
#
============================================================
--- packages/directfb/directfb-1.1.0/fix-pkgconfig-cflags.patch 464f9e278097273487073221ea710e606f92bc6c
+++ packages/directfb/directfb-1.1.0/fix-pkgconfig-cflags.patch 464f9e278097273487073221ea710e606f92bc6c
@@ -0,0 +1,57 @@
+Index: DirectFB-1.1.0/directfb-internal.pc.in
+===================================================================
+--- DirectFB-1.1.0.orig/directfb-internal.pc.in 2008-06-22 16:16:13.851722040 +0200
++++ DirectFB-1.1.0/directfb-internal.pc.in 2008-06-22 16:16:33.665465096 +0200
+@@ -2,10 +2,10 @@
+ exec_prefix=@exec_prefix@
+ moduledir=@MODULEDIR@
+ moduledirname=@MODULEDIRNAME@
+-includedir=@INTERNALINCLUDEDIR@
++includedir=@includedir@
+
+ Name: DirectFB-Internal
+ Description: Third party module support package for DirectFB.
+ Version: @VERSION@
+ Requires: directfb = @VERSION@
+-Cflags: @DFB_INTERNAL_CFLAGS@ -I at INTERNALINCLUDEDIR@
++Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir}/directfb-internal
+Index: DirectFB-1.1.0/directfb.pc.in
+===================================================================
+--- DirectFB-1.1.0.orig/directfb.pc.in 2008-06-22 16:16:13.868387652 +0200
++++ DirectFB-1.1.0/directfb.pc.in 2008-06-22 16:16:50.816223652 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: fusion direct
+ Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@
+-Cflags: @THREADFLAGS@ -I at INCLUDEDIR@
++Cflags: @THREADFLAGS@ -I${includedir}/directfb
+Index: DirectFB-1.1.0/lib/direct/direct.pc.in
+===================================================================
+--- DirectFB-1.1.0.orig/lib/direct/direct.pc.in 2008-06-22 16:16:13.888387824 +0200
++++ DirectFB-1.1.0/lib/direct/direct.pc.in 2008-06-22 16:16:17.121721173 +0200
+@@ -7,4 +7,4 @@
+ Description: DirectFB base development library
+ Version: @VERSION@
+ Libs: -L${libdir} -ldirect @THREADLIB@ @DYNLIB@
+-Cflags: @THREADFLAGS@ -I at INCLUDEDIR@
++Cflags: @THREADFLAGS@ -I${includedir}/directfb
+Index: DirectFB-1.1.0/lib/fusion/fusion.pc.in
+===================================================================
+--- DirectFB-1.1.0.orig/lib/fusion/fusion.pc.in 2008-06-22 16:16:13.905054457 +0200
++++ DirectFB-1.1.0/lib/fusion/fusion.pc.in 2008-06-22 16:16:17.121721173 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: direct
+ Libs: -L${libdir} -lfusion
+-Cflags: -I at INCLUDEDIR@
++Cflags: -I${includedir}/directfb
+Index: DirectFB-1.1.0/lib/voodoo/voodoo.pc.in
+===================================================================
+--- DirectFB-1.1.0.orig/lib/voodoo/voodoo.pc.in 2008-06-22 16:16:13.931720483 +0200
++++ DirectFB-1.1.0/lib/voodoo/voodoo.pc.in 2008-06-22 16:16:17.121721173 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: direct
+ Libs: -L${libdir} -lvoodoo
+-Cflags: -I at INCLUDEDIR@
++Cflags: -I${includedir}/directfb
============================================================
--- packages/directfb/directfb-1.1.1/fix-pkgconfig-cflags.patch 7eb9f5067ab77fa58b944af9d2fe6a8d40866b63
+++ packages/directfb/directfb-1.1.1/fix-pkgconfig-cflags.patch 7eb9f5067ab77fa58b944af9d2fe6a8d40866b63
@@ -0,0 +1,47 @@
+Index: DirectFB-1.1.1/directfb-internal.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/directfb-internal.pc.in 2007-08-07 21:43:00.000000000 +0200
++++ DirectFB-1.1.1/directfb-internal.pc.in 2008-07-17 21:00:47.424654304 +0200
+@@ -2,10 +2,10 @@
+ exec_prefix=@exec_prefix@
+ moduledir=@MODULEDIR@
+ moduledirname=@MODULEDIRNAME@
+-includedir=@INTERNALINCLUDEDIR@
++includedir=@includedir@
+
+ Name: DirectFB-Internal
+ Description: Third party module support package for DirectFB.
+ Version: @VERSION@
+ Requires: directfb = @VERSION@
+-Cflags: @DFB_INTERNAL_CFLAGS@ -I at INTERNALINCLUDEDIR@
++Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir}
+Index: DirectFB-1.1.1/directfb.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/directfb.pc.in 2007-12-15 16:23:16.000000000 +0100
++++ DirectFB-1.1.1/directfb.pc.in 2008-07-17 20:59:58.044985193 +0200
+@@ -9,4 +9,4 @@
+ Requires: fusion direct
+ Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@
+ Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@
+-Cflags: @THREADFLAGS@ -I at INCLUDEDIR@
++Cflags: @THREADFLAGS@ -I${includedir}/directfb
+Index: DirectFB-1.1.1/lib/fusion/fusion.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/lib/fusion/fusion.pc.in 2007-08-07 21:43:00.000000000 +0200
++++ DirectFB-1.1.1/lib/fusion/fusion.pc.in 2008-07-17 20:58:07.051338866 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: direct
+ Libs: -L${libdir} -lfusion
+-Cflags: -I at INCLUDEDIR@
++Cflags: -I${includedir}/directfb -I${includedir}
+Index: DirectFB-1.1.1/lib/voodoo/voodoo.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/lib/voodoo/voodoo.pc.in 2007-08-07 21:43:00.000000000 +0200
++++ DirectFB-1.1.1/lib/voodoo/voodoo.pc.in 2008-07-17 20:58:07.054671842 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: direct
+ Libs: -L${libdir} -lvoodoo
+-Cflags: -I at INCLUDEDIR@
++Cflags: -I${includedir}/directfb -I${includedir}
============================================================
--- packages/directfb/directfb_1.1.0.bb cc54936579ba85e537fe3cbbc8eb7aa50d205d08
+++ packages/directfb/directfb_1.1.0.bb cc54936579ba85e537fe3cbbc8eb7aa50d205d08
@@ -0,0 +1,6 @@
+require directfb.inc
+
+RV = "1.1-0"
+PR = "r6"
+
+LEAD_SONAME = "libdirect-1.1.so"
============================================================
--- packages/directfb/files/ts_lib_autotools.patch 28ac46a6b96a520fe67bbb107d29ffca07fab547
+++ packages/directfb/files/ts_lib_autotools.patch 28ac46a6b96a520fe67bbb107d29ffca07fab547
@@ -0,0 +1,16 @@
+Index: DirectFB-1.1.1/configure.in
+===================================================================
+--- DirectFB-1.1.1.orig/configure.in 2008-05-07 23:08:04.000000000 +0200
++++ DirectFB-1.1.1/configure.in 2008-05-07 23:15:43.000000000 +0200
+@@ -1292,8 +1292,11 @@
+
+ enable_tslib=no
+ if test "$checkfor_tslib" = "yes"; then
++ PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0.0], [enable_tslib=yes], [enable_tslib=no])
++ if test "$enable_tslib" = "no"; then
+ PKG_CHECK_MODULES([TSLIB], [tslib-0.0 >= 0.0.2], enable_tslib=yes, enable_tslib=no
+ AC_MSG_WARN([*** no tslib -- tslib driver will not be built.]))
++ fi
+ fi
+
+ enable_ucb1x00_ts=no
============================================================
--- packages/directfb/directfb.inc 7636873a711a2ff73ab22ef51689749ae798bcee
+++ packages/directfb/directfb.inc 4563eb9b40a7a1dbf5bdc129a16d536619b1347d
@@ -7,17 +7,15 @@ DEPENDS = "jpeg libpng freetype zlib tsl
LICENSE = "LGPL"
HOMEPAGE = "http://directfb.org"
DEPENDS = "jpeg libpng freetype zlib tslib"
-RV = "1.0-0"
-PR = "r5"
SRC_URI = " \
http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
file://fix-pkgconfig-cflags.patch;patch=1 \
file://fix-font-missing-char.patch;patch=1 \
file://getpagesize.patch;patch=1 \
- file://fix-includes.patch;patch=1 \
file://mkdfiff.patch;patch=1 \
file://dont-use-linux-config.patch;patch=1 \
+ file://ts_lib_autotools.patch;patch=1 \
"
S = "${WORKDIR}/DirectFB-${PV}"
============================================================
--- packages/directfb/directfb_1.0.0.bb e52d09cf53e4d6a09fdffe006f662714b7877cb3
+++ packages/directfb/directfb_1.0.0.bb 32e695c23d072d270a64f07b79f94a54a7b70657
@@ -1,3 +1,7 @@ require directfb.inc
require directfb.inc
+
+SRC_URI += "file://fix-includes.patch;patch=1"
+
RV = "1.0-0"
+PR = "r6"
============================================================
--- packages/directfb/directfb_1.1.0.bb 0cf2dec34724035cfe2a2d74dcd2a885943f13b7
+++ packages/directfb/directfb_1.1.1.bb 2d3add3ec1b53538f6ff50763d4c32884b226774
@@ -1,3 +1,27 @@ RV = "1.1-0"
require directfb.inc
RV = "1.1-0"
+PR = "r0"
+
+DEPENDS += "sysfsutils"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = " \
+ http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
+ file://fix-pkgconfig-cflags.patch;patch=1 \
+ file://fix-font-missing-char.patch;patch=1 \
+ file://mkdfiff.patch;patch=1 \
+ file://dont-use-linux-config.patch;patch=1 \
+ file://ts_lib_autotools.patch;patch=1 \
+"
+
+EXTRA_OECONF = "\
+ --enable-freetype=yes \
+ --enable-zlib \
+ --with-gfxdrivers=none \
+ --disable-libmpeg3 \
+ --disable-sdl \
+ --disable-vnc \
+ --disable-x11 \
+"
More information about the Openembedded-commits
mailing list