[oe-commits] org.oe.dev merge of '1ebb8320b743c004de3edbcfb17ea43a7cfbe6b2'
koen commit
oe at amethyst.openembedded.net
Mon Sep 1 17:53:28 UTC 2008
merge of '1ebb8320b743c004de3edbcfb17ea43a7cfbe6b2'
and '5f904f7a12f760543efbb50eed318ac4e50f6558'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: d7ac2578b689d01a8d9b17579781f0f7a6926ebd
ViewMTN: http://monotone.openembedded.org/revision/info/d7ac2578b689d01a8d9b17579781f0f7a6926ebd
Files:
1
packages/fontconfig/fontconfig-2.6.0
packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
packages/fontconfig/fontconfig-native_2.6.0.bb
packages/fontconfig/fontconfig_2.6.0.bb
packages/opensync/libopensync-0.36/build-in-src.patch
packages/opensync/libopensync-0.36/cmake.patch
packages/opensync/libopensync-0.36/no-python-check.patch
packages/nfs-utils/nfs-utils_1.1.2.bb
packages/libusb/libusb-compat-0.0.9+0.1.0-beta1
packages/libusb/libusb-compat-0.0.9+0.1.0-beta2
packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb
packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
packages/libusb/libusb1-0.9.0
packages/libusb/libusb1-0.9.2
packages/libusb/libusb1_0.9.0.bb
packages/libusb/libusb1_0.9.2.bb
Diffs:
#
# mt diff -r1ebb8320b743c004de3edbcfb17ea43a7cfbe6b2 -rd7ac2578b689d01a8d9b17579781f0f7a6926ebd
#
#
#
# add_dir "packages/fontconfig/fontconfig-2.6.0"
#
# add_file "packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch"
# content [5151c1f229c32c3ecb233fa9bd718d0b50d6ff1c]
#
# add_file "packages/fontconfig/fontconfig-native_2.6.0.bb"
# content [24c03de8b197db8f1a84eb259d920c904b79f74b]
#
# add_file "packages/fontconfig/fontconfig_2.6.0.bb"
# content [5554f91bd476e11e0bb44b471239d177ef4b0faa]
#
# add_file "packages/opensync/libopensync-0.36/build-in-src.patch"
# content [f33e99322f9822e3719b7a4a138c733baf5c8409]
#
# add_file "packages/opensync/libopensync-0.36/cmake.patch"
# content [b50f3637f4dd635c1de2fed11af7b8bcb85f29a4]
#
# add_file "packages/opensync/libopensync-0.36/no-python-check.patch"
# content [f04d85e907104ca7e6f381658daf76fb31888385]
#
# patch "packages/nfs-utils/nfs-utils_1.1.2.bb"
# from [c8fc676bb8563f810f362e205ae46c3b75388b51]
# to [1815e0ef2aa6e30bdea10f6313e236b9f67ac58f]
#
============================================================
--- packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch 5151c1f229c32c3ecb233fa9bd718d0b50d6ff1c
+++ packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch 5151c1f229c32c3ecb233fa9bd718d0b50d6ff1c
@@ -0,0 +1,15 @@
+---
+ fontconfig.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- fontconfig-2.6.0.orig/fontconfig.pc.in
++++ fontconfig-2.6.0/fontconfig.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+
+ Name: Fontconfig
+ Description: Font configuration and customization library
+ Version: @VERSION@
+ Libs: -L${libdir} -lfontconfig
+-Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@
++Libs.private: @EXPAT_LIBS@ -L${libdir} -lfreetype
+ Cflags: -I${includedir}
============================================================
--- packages/fontconfig/fontconfig-native_2.6.0.bb 24c03de8b197db8f1a84eb259d920c904b79f74b
+++ packages/fontconfig/fontconfig-native_2.6.0.bb 24c03de8b197db8f1a84eb259d920c904b79f74b
@@ -0,0 +1,15 @@
+SECTION = "base"
+LICENSE = "BSD"
+require fontconfig_${PV}.bb
+inherit native
+DEPENDS = "freetype-native expat-native zlib-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
+
+EXTRA_OEMAKE = ""
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
+
+do_stage () {
+ oe_runmake install
+ install fc-lang/fc-lang ${STAGING_BINDIR}
+ install fc-glyphname/fc-glyphname ${STAGING_BINDIR}
+}
============================================================
--- packages/fontconfig/fontconfig_2.6.0.bb 5554f91bd476e11e0bb44b471239d177ef4b0faa
+++ packages/fontconfig/fontconfig_2.6.0.bb 5554f91bd476e11e0bb44b471239d177ef4b0faa
@@ -0,0 +1,76 @@
+SECTION = "libs"
+LICENSE = "BSD"
+DESCRIPTION = "A library for configuring and customizing font access."
+DEPENDS = "expat freetype zlib"
+
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
+ file://fix-pkgconfig.patch;patch=1"
+
+PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
+FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
+FILES_fontconfig-utils = "${bindir}/*"
+
+# Work around past breakage in debian.bbclass
+RPROVIDES_fontconfig-utils = "libfontconfig-utils"
+RREPLACES_fontconfig-utils = "libfontconfig-utils"
+RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
+DEBIAN_NOAUTONAME_fontconfig-utils = "1"
+
+S = "${WORKDIR}/fontconfig-${PV}"
+
+PARALLEL_MAKE = ""
+
+inherit autotools pkgconfig
+
+export HASDOCBOOK="no"
+
+EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}"
+EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
+
+# The tarball has some of the patched files as read only, which
+# patch doesn't like at all
+
+fontconfig_do_unpack() {
+ chmod -R u+rw ${S}
+}
+
+python do_unpack () {
+ bb.build.exec_func('base_do_unpack', d)
+ bb.build.exec_func('fontconfig_do_unpack', d)
+}
+
+do_stage () {
+ oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/fontconfig
+ for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+}
+
+BUILD_CFLAGS += " -I${STAGING_INCDIR}/freetype2"
+
+do_configure_append () {
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
+
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
+
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
+
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
+
+}
+
+do_install () {
+ autotools_do_install
+}
+
============================================================
--- packages/opensync/libopensync-0.36/build-in-src.patch f33e99322f9822e3719b7a4a138c733baf5c8409
+++ packages/opensync/libopensync-0.36/build-in-src.patch f33e99322f9822e3719b7a4a138c733baf5c8409
@@ -0,0 +1,18 @@
+---
+ cmake/OpenSyncInternal.cmake.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- libopensync-0.36.orig/cmake/OpenSyncInternal.cmake.in
++++ libopensync-0.36/cmake/OpenSyncInternal.cmake.in
+@@ -5,11 +5,10 @@ INCLUDE( OpenSyncTesting )
+ INCLUDE( OpenSyncPackaging )
+ INCLUDE( OpenSyncPlugin )
+ INCLUDE( OpenSyncPlatforms )
+ INCLUDE( MacroEnsureOutOfSourceBuild )
+
+-MACRO_ENSURE_OUT_OF_SOURCE_BUILD("${CMAKE_PROJECT_NAME} doesn't allow to build within the source directory. Please, create a seperate build directory and run 'cmake ${PROJECT_SOURCE_DIR} [options]'!")
+
+
+ SET( OPENSYNC_PLUGINDIR "@OPENSYNC_PLUGINDIR@" )
+ SET( OPENSYNC_FORMATSDIR "@OPENSYNC_FORMATSDIR@" )
+ SET( OPENSYNC_PYTHON_PLUGINDIR "@OPENSYNC_PYTHON_PLUGINDIR@" )
============================================================
--- packages/opensync/libopensync-0.36/cmake.patch b50f3637f4dd635c1de2fed11af7b8bcb85f29a4
+++ packages/opensync/libopensync-0.36/cmake.patch b50f3637f4dd635c1de2fed11af7b8bcb85f29a4
@@ -0,0 +1,18 @@
+---
+ opensync/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- libopensync-0.36.orig/opensync/CMakeLists.txt
++++ libopensync-0.36/opensync/CMakeLists.txt
+@@ -55,11 +55,10 @@ SET( libopensync_LIB_SRCS
+ ADD_LIBRARY( opensync SHARED ${libopensync_LIB_SRCS} )
+
+ TARGET_LINK_LIBRARIES( opensync ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GMODULE2_LIBRARIES} ${LIBXML2_LIBRARIES} ${SQLITE3_LIBRARIES} )
+
+ SET_TARGET_PROPERTIES( opensync PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+-SET_TARGET_PROPERTIES( opensync PROPERTIES LINK_FLAGS ${SYMBOLS_VISIBILITY} )
+
+ IF ( OPENSYNC_UNITTESTS )
+ ADD_LIBRARY( opensync-testing SHARED ${libopensync_LIB_SRCS} )
+ TARGET_LINK_LIBRARIES( opensync-testing ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GMODULE2_LIBRARIES} ${LIBXML2_LIBRARIES} ${SQLITE3_LIBRARIES} )
+ ENDIF ( OPENSYNC_UNITTESTS )
============================================================
--- packages/opensync/libopensync-0.36/no-python-check.patch f04d85e907104ca7e6f381658daf76fb31888385
+++ packages/opensync/libopensync-0.36/no-python-check.patch f04d85e907104ca7e6f381658daf76fb31888385
@@ -0,0 +1,18 @@
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- libopensync-0.36.orig/CMakeLists.txt
++++ libopensync-0.36/CMakeLists.txt
+@@ -26,11 +26,10 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BIN
+
+ FIND_PACKAGE( GLIB2 REQUIRED )
+ FIND_PACKAGE( Sqlite3 REQUIRED )
+ FIND_PACKAGE( LibXml2 REQUIRED )
+ FIND_PACKAGE( SWIG )
+-FIND_PACKAGE( PythonLibs )
+ FIND_PACKAGE( Check )
+
+ ADD_SUBDIRECTORY( opensync )
+ ADD_SUBDIRECTORY( formats )
+ ADD_SUBDIRECTORY( tools )
============================================================
--- packages/nfs-utils/nfs-utils_1.1.2.bb c8fc676bb8563f810f362e205ae46c3b75388b51
+++ packages/nfs-utils/nfs-utils_1.1.2.bb 1815e0ef2aa6e30bdea10f6313e236b9f67ac58f
@@ -3,6 +3,8 @@ LICENSE = "GPL"
SECTION = "console/network"
LICENSE = "GPL"
+PR = "2"
+
DEPENDS = "tcp-wrappers libevent"
SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
@@ -45,14 +47,17 @@ do_install() {
install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
install -d ${D}${sbindir}
+ install -d ${D}${base_sbindir}
install -m 0755 ${S}/utils/exportfs/exportfs ${D}${sbindir}/exportfs
install -m 0755 ${S}/utils/mountd/mountd ${D}${sbindir}/mountd
- install -m 0755 ${S}/utils/mount/mount.nfs ${D}${sbindir}/mount.nfs
+ install -m 0755 ${S}/utils/mount/mount.nfs ${D}${base_sbindir}/mount.nfs
install -m 0755 ${S}/utils/nfsd/nfsd ${D}${sbindir}/nfsd
install -m 0755 ${S}/utils/nfsstat/nfsstat ${D}${sbindir}/nfsstat
install -m 0755 ${S}/utils/showmount/showmount ${D}${sbindir}/showmount
install -m 0755 ${S}/utils/statd/statd ${D}${sbindir}/statd
+ ln -s ${D}/${base_sbindir}/mount.nfs ${D}/${base_sbindir}/mount.nfs4
+
install -d ${D}${mandir}/man8
install -m 0644 ${S}/utils/exportfs/exportfs.man ${D}${mandir}/man8/exportfs.8
install -m 0644 ${S}/utils/mountd/mountd.man ${D}${mandir}/man8/mountd.8
@@ -61,3 +66,6 @@ do_install() {
install -m 0644 ${S}/utils/showmount/showmount.man ${D}${mandir}/man8/showmount.8
install -m 0644 ${S}/utils/statd/statd.man ${D}${mandir}/man8/statd.8
}
+
+PACKAGES =+ "nfs-utils-client"
+FILES_nfs-utils-client = "${base_sbindir}/mount.nfs ${base_sbindir}/mount.nfs4"
#
# mt diff -r5f904f7a12f760543efbb50eed318ac4e50f6558 -rd7ac2578b689d01a8d9b17579781f0f7a6926ebd
#
#
#
# rename "packages/libusb/libusb-compat-0.0.9+0.1.0-beta1"
# to "packages/libusb/libusb-compat-0.0.9+0.1.0-beta2"
#
# rename "packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb"
# to "packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb"
#
# rename "packages/libusb/libusb1-0.9.0"
# to "packages/libusb/libusb1-0.9.2"
#
# rename "packages/libusb/libusb1_0.9.0.bb"
# to "packages/libusb/libusb1_0.9.2.bb"
#
# patch "packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb"
# from [eca681d4a91dfb5cb7fa4e2d5326809890304bba]
# to [e5d649a0a56ef19311c60e326a809da275cdba29]
#
# patch "packages/libusb/libusb1_0.9.2.bb"
# from [b413efeaadf36cc125444ba8f9db23c724492158]
# to [daa46b7579d1a354a7b7107c31e52b4629a48180]
#
============================================================
--- packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb eca681d4a91dfb5cb7fa4e2d5326809890304bba
+++ packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb e5d649a0a56ef19311c60e326a809da275cdba29
@@ -5,15 +5,15 @@ PE = "1"
LICENSE = "LGPL"
PE = "1"
-PR = "r1"
+PR = "r0"
DEPENDS = "libusb1"
-SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-0.1.0-beta1.tar.bz2 \
+SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-0.1.0-beta2.tar.bz2 \
file://0.1.0-beta1-gcc3.4-fix.patch;patch=1 \
"
-S = "${WORKDIR}/libusb-compat-0.1.0-beta1"
+S = "${WORKDIR}/libusb-compat-0.1.0-beta2"
inherit autotools pkgconfig binconfig lib_package
============================================================
--- packages/libusb/libusb1_0.9.0.bb b413efeaadf36cc125444ba8f9db23c724492158
+++ packages/libusb/libusb1_0.9.2.bb daa46b7579d1a354a7b7107c31e52b4629a48180
@@ -4,7 +4,7 @@ LICENSE = "LGPL"
SECTION = "libs"
LICENSE = "LGPL"
-PR = "r1"
+PR = "r0"
SRC_URI = "\
${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
More information about the Openembedded-commits
mailing list