[oe-commits] org.oe.dev merge of '33512049e02cf7c8e5bd9b457c06f88047a373bb'

rwhitby commit openembedded-commits at lists.openembedded.org
Thu Jun 21 17:42:10 UTC 2007


merge of '33512049e02cf7c8e5bd9b457c06f88047a373bb'
     and '338a4c3a2eeb15c49e9ff9d0d90fb71ab1ddad3a'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: d6d4199be1379dc951fdff8d42e70b1f30a839de
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d6d4199be1379dc951fdff8d42e70b1f30a839de
Files:
1
packages/pptp-linux/pptp-linux
packages/pptp-linux/pptp-linux-1.5.0
packages/pptp-linux/pptp-linux_1.5.0.bb
packages/pptp-linux/pptp-linux_1.7.1.bb
packages/pptp-linux/pptp-linux-1.7.1
packages/cairo/cairo_1.4.8.bb
packages/pptp-linux/pptp-linux-1.7.1/options.pptp
packages/qmake/qmake2-native-2.01a/0001-fix-mkspecs.patch
packages/anthy/anthy-native_7811.bb
packages/fbreader/fbreader_0.8.2a.bb
packages/opie-reader/uqtreader_cvs.bb
packages/perl/perl-native_5.8.8.bb
packages/pulseaudio/pulse.inc
packages/pulseaudio/pulseaudio_0.9.5.bb
packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf
packages/qmake/qmake2-native_2.01a.bb
packages/qt/qt4-x11-free_4.3.0.bb
packages/rp-pppoe/rp-pppoe_3.8.bb
packages/usb-gadget-mode/usb-gadget-mode.bb
Diffs:

#
# mt diff -r33512049e02cf7c8e5bd9b457c06f88047a373bb -rd6d4199be1379dc951fdff8d42e70b1f30a839de
#
# 
# no changes
# 


#
# mt diff -r338a4c3a2eeb15c49e9ff9d0d90fb71ab1ddad3a -rd6d4199be1379dc951fdff8d42e70b1f30a839de
#
# 
# 
# rename "packages/pptp-linux/pptp-linux"
#     to "packages/pptp-linux/pptp-linux-1.5.0"
# 
# rename "packages/pptp-linux/pptp-linux_1.5.0.bb"
#     to "packages/pptp-linux/pptp-linux_1.7.1.bb"
# 
# add_dir "packages/pptp-linux/pptp-linux-1.7.1"
# 
# add_file "packages/cairo/cairo_1.4.8.bb"
#  content [0b4c4e2659b89399b3645efcdbf2bc4f3cf8dff0]
# 
# add_file "packages/pptp-linux/pptp-linux-1.7.1/options.pptp"
#  content [73fc428e0088b8210ad2926ff38ed0514b5fc7d4]
# 
# add_file "packages/pptp-linux/pptp-linux_1.5.0.bb"
#  content [558c8c16ff48470492bbadfaedc7ac5a7b4691fa]
# 
# add_file "packages/qmake/qmake2-native-2.01a/0001-fix-mkspecs.patch"
#  content [922f4e6417cdecfd244c36a59d7ff67bb3e7578c]
# 
# patch "packages/anthy/anthy-native_7811.bb"
#  from [0852d3f15cc531f469f5f4663dcd43a81b58fdfc]
#    to [1c86d0d34dbd9631155115cf42b4650f5062ee80]
# 
# patch "packages/fbreader/fbreader_0.8.2a.bb"
#  from [d186c3a474b964b86a2aea54192bf9bb090cdde0]
#    to [2281178bcfe616a911377e8d53a105e730186348]
# 
# patch "packages/opie-reader/uqtreader_cvs.bb"
#  from [b5eaf8da58651885a61786aed8e5b69735c2160b]
#    to [41cadc7ecb1fb1639efc6ee038608e24926313b3]
# 
# patch "packages/perl/perl-native_5.8.8.bb"
#  from [c0743df758d0d39ece2b86e2f02407860b131a37]
#    to [2f2d7163b1fd47aa9554cf3e954cd81ea1e73556]
# 
# patch "packages/pptp-linux/pptp-linux_1.7.1.bb"
#  from [558c8c16ff48470492bbadfaedc7ac5a7b4691fa]
#    to [263e08b1262191b23d77c94224359cdd4897e8af]
# 
# patch "packages/pulseaudio/pulse.inc"
#  from [49cb20c18bb9950a2d327522824ef326b6c4a39a]
#    to [dfb25678adb1d2a72abcc8ec418d2e951b8ff5ef]
# 
# patch "packages/pulseaudio/pulseaudio_0.9.5.bb"
#  from [a11c1056ff363bda7672ea63e72652f348e0571f]
#    to [5e6d8a62c5f2c73ef633203ff8ee3473c6092950]
# 
# patch "packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf"
#  from [9e4570665390ba4cec5ed09944b160e38ee6261c]
#    to [c82809da5345d47e3b84f36c116a3d8f9a283d4d]
# 
# patch "packages/qmake/qmake2-native_2.01a.bb"
#  from [f53a579a8da06c4db16e86cc70f3a6ac22e8da31]
#    to [17ddd6208bf05e7171ef2ba6625d25bf7c067677]
# 
# patch "packages/qt/qt4-x11-free_4.3.0.bb"
#  from [d152171fd14161bc98c897b00759aad5f0aa461f]
#    to [9cc09d8cdd4f53ae7503b1a7dccf8907c9472431]
# 
# patch "packages/rp-pppoe/rp-pppoe_3.8.bb"
#  from [f5e17a83e7c06f8fad1294aae082fe09b0585f8d]
#    to [f96008f57859c05eee60eee5a53f342d0d5ae18a]
# 
# patch "packages/usb-gadget-mode/usb-gadget-mode.bb"
#  from [5c1879bde1da361d8ba306b67005e7b94ba66933]
#    to [42d48b72661e355aadc5b25f5cadb73dcf5328ce]
# 
============================================================
--- packages/cairo/cairo_1.4.8.bb	0b4c4e2659b89399b3645efcdbf2bc4f3cf8dff0
+++ packages/cairo/cairo_1.4.8.bb	0b4c4e2659b89399b3645efcdbf2bc4f3cf8dff0
@@ -0,0 +1,6 @@
+require cairo.inc
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
+
+PR = "r0"
+
============================================================
--- packages/pptp-linux/pptp-linux-1.7.1/options.pptp	73fc428e0088b8210ad2926ff38ed0514b5fc7d4
+++ packages/pptp-linux/pptp-linux-1.7.1/options.pptp	73fc428e0088b8210ad2926ff38ed0514b5fc7d4
@@ -0,0 +1,30 @@
+#
+# Lock the port
+#
+lock
+
+#
+# We don't need the tunnel server to authenticate itself
+#
+noauth
+
+#
+# Turn off transmission protocols we know won't be used
+#
+nobsdcomp
+nodeflate
+
+#
+# We want MPPE
+# (option naming specific to ppp 2.4.0 with unofficial patch)
+#
+#mppe-40
+mppe-128
+#mppe-stateless
+
+#
+# We want a sane mtu/mru 
+# (ppp 2.4.0 with unofficial patch)
+#
+#mtu 1000
+#mru 1000
============================================================
--- packages/pptp-linux/pptp-linux_1.5.0.bb	558c8c16ff48470492bbadfaedc7ac5a7b4691fa
+++ packages/pptp-linux/pptp-linux_1.5.0.bb	558c8c16ff48470492bbadfaedc7ac5a7b4691fa
@@ -0,0 +1,33 @@
+DESCRIPTION = "PPTP Client is a Linux, FreeBSD, NetBSD\
+and OpenBSD client for the proprietary Microsoft Point-to-Point \
+Tunneling Protocol, PPTP. Allows connection to a PPTP based \
+Virtual Private Network (VPN) as used by employers and some \
+cable and ADSL internet service providers."
+LICENSE     = "GPL"
+SECTION = "network"
+PRIORITY    = "optional"
+DEPENDS     = "ppp "
+
+inherit base
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pptpclient/pptp-linux-1.5.0.tar.gz \
+	   file://makefile.patch;patch=1 \
+	   file://options.pptp"
+
+
+do_configure() {
+}
+
+do_compile() {
+	oe_runmake
+}
+
+do_install() {
+	install -d ${D}${sbindir}
+	install -d ${D}/etc/
+	install -d ${D}/etc/ppp/
+
+	install -m 0755  pptp         ${D}${sbindir}/
+	install -m 0644 ${WORKDIR}/options.pptp ${D}/etc/ppp/
+
+}
============================================================
--- packages/qmake/qmake2-native-2.01a/0001-fix-mkspecs.patch	922f4e6417cdecfd244c36a59d7ff67bb3e7578c
+++ packages/qmake/qmake2-native-2.01a/0001-fix-mkspecs.patch	922f4e6417cdecfd244c36a59d7ff67bb3e7578c
@@ -0,0 +1,123 @@
+From 594157753a24d0575aaf948dc0e9500f6bdb2178 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker at klever.net>
+Date: Sat, 2 Jun 2007 16:39:58 +0200
+Subject: [PATCH] fix mkspecs
+
+---
+ mkspecs/common/g++.conf   |   18 +++++++++---------
+ mkspecs/common/linux.conf |   26 +++++++++++++-------------
+ 2 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf
+index f5a5c8e..4007c7e 100644
+--- a/mkspecs/common/g++.conf
++++ b/mkspecs/common/g++.conf
+@@ -2,12 +2,12 @@
+ # qmake configuration for common gcc
+ #
+ 
+-QMAKE_CC		= gcc
+-QMAKE_CFLAGS		+= -pipe
++QMAKE_CC		= $(OE_QMAKE_CC)
++QMAKE_CFLAGS		+= -pipe $(OE_QMAKE_CFLAGS)
+ QMAKE_CFLAGS_DEPS	+= -M
+ QMAKE_CFLAGS_WARN_ON	+= -Wall -W
+ QMAKE_CFLAGS_WARN_OFF	+= -w
+-QMAKE_CFLAGS_RELEASE	+= -O2
++QMAKE_CFLAGS_RELEASE	+= -O2 
+ QMAKE_CFLAGS_DEBUG	+= -g
+ QMAKE_CFLAGS_SHLIB	+= -fPIC
+ QMAKE_CFLAGS_STATIC_LIB	+= -fPIC
+@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS   += -fvisibility=hidden
+ QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+ QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
+ 
+-QMAKE_CXX		= g++
+-QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS
++QMAKE_CXX		= $(OE_QMAKE_CXX)
++QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
+ QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON
+ QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF
+@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+ QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+ QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+ 
+-QMAKE_LINK		= g++
+-QMAKE_LINK_SHLIB	= g++
+-QMAKE_LFLAGS		+=
++QMAKE_LINK		= $(OE_QMAKE_LINK)
++QMAKE_LINK_SHLIB	= $(OE_QMAKE_LINK)
++QMAKE_LFLAGS		+= $(OE_QMAKE_LDFLAGS)
+ QMAKE_LFLAGS_RELEASE	+=
+ QMAKE_LFLAGS_DEBUG	+=
+ QMAKE_LFLAGS_APP	+=
+@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB	+= -shared
+ QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME	+= -Wl,-soname,
+ QMAKE_LFLAGS_THREAD	+=
+-QMAKE_RPATH		= -Wl,-rpath,
++QMAKE_RPATH		= -Wl,-rpath-link,
+ 
+ QMAKE_PCH_OUTPUT_EXT    = .gch
+ 
+diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
+index 3796a87..52acf16 100644
+--- a/mkspecs/common/linux.conf
++++ b/mkspecs/common/linux.conf
+@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD
+ 
+ QMAKE_INCDIR          =
+ QMAKE_LIBDIR          =
+-QMAKE_INCDIR_X11      = /usr/X11R6/include
+-QMAKE_LIBDIR_X11      = /usr/X11R6/lib
+-QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
+-QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
+-QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
++QMAKE_INCDIR_X11      = 
++QMAKE_LIBDIR_X11      = 
++QMAKE_INCDIR_QT       = $(OE_QMAKE_INCDIR_QT)
++QMAKE_LIBDIR_QT       = $(OE_QMAKE_LIBDIR_QT)
++QMAKE_INCDIR_OPENGL   = 
++QMAKE_LIBDIR_OPENGL   = 
+ 
+ QMAKE_LIBS            =
+ QMAKE_LIBS_DYNLOAD    = -ldl
+-QMAKE_LIBS_X11        = -lXext -lX11 -lm
+-QMAKE_LIBS_X11SM      = -lSM -lICE
++QMAKE_LIBS_X11        = $(OE_QMAKE_LIBS_X11)
++QMAKE_LIBS_X11SM      = $(OE_QMAKE_LIBS_X11SM)
+ QMAKE_LIBS_NIS        = -lnsl
+ QMAKE_LIBS_OPENGL     = -lGLU -lGL
+ QMAKE_LIBS_OPENGL_QT  = -lGL
+ QMAKE_LIBS_THREAD     = -lpthread
+ 
+-QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc
+-QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic
++QMAKE_MOC             = $(OE_QMAKE_MOC)
++QMAKE_UIC             = $(OE_QMAKE_UIC)
+ 
+-QMAKE_AR              = ar cqs
++QMAKE_AR              = $(OE_QMAKE_AR) cqs
+ QMAKE_RANLIB          =
+ 
+ QMAKE_TAR             = tar -cf
+@@ -38,11 +38,11 @@ QMAKE_COPY_DIR        = $(COPY) -r
+ QMAKE_MOVE            = mv -f
+ QMAKE_DEL_FILE        = rm -f
+ QMAKE_DEL_DIR         = rmdir
+-QMAKE_STRIP           = strip
++QMAKE_STRIP           = $(OE_QMAKE_STRIP)
+ QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+ QMAKE_CHK_DIR_EXISTS  = test -d
+ QMAKE_MKDIR           = mkdir -p
+ QMAKE_INSTALL_FILE    = install -m 644 -p
+ QMAKE_INSTALL_PROGRAM = install -m 755 -p
+ 
+-include(unix.conf)
+\ No newline at end of file
++include(unix.conf)
+-- 
+1.5.1.6
+
============================================================
--- packages/anthy/anthy-native_7811.bb	0852d3f15cc531f469f5f4663dcd43a81b58fdfc
+++ packages/anthy/anthy-native_7811.bb	1c86d0d34dbd9631155115cf42b4650f5062ee80
@@ -1,4 +1,9 @@ require anthy_${PV}.bb
 require anthy_${PV}.bb
+
+DEPENDS = ""
 PACKAGES = ""
-DEPENDS = ""
+PR = "r1"
+
+S = "${WORKDIR}/anthy-${PV}"
+
 inherit native
============================================================
--- packages/fbreader/fbreader_0.8.2a.bb	d186c3a474b964b86a2aea54192bf9bb090cdde0
+++ packages/fbreader/fbreader_0.8.2a.bb	2281178bcfe616a911377e8d53a105e730186348
@@ -8,7 +8,7 @@ PR = "r3"
 
 # The RESOLUTION is defined at compile time which makes
 # this package MACHINE specific.
-PACKAGE_ARCH_${PN} = "${MACHINE}"
+PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
 
 SRC_URI = "http://only.mawhrin.net/fbreader/fbreader-sources-${PV}.tgz \
 	   file://fbreader-0.8.2a_buildsys_oe.patch;patch=1 \
@@ -21,11 +21,11 @@ READER_STATUS	  = "release"
 READER_STATUS	  = "release"
 
 # Set device specific overrides
-RESOLUTION_fic-gta01 = "480x640"
+READER_RESOLUTION_fic-gta01 = "480x640"
 
 FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary"
 
-CFLAGS_append = " RESOLUTION=${RESOLUTION} INSTALLDIR=/usr"
+CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=/usr"
 EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
 
 inherit pkgconfig
@@ -45,6 +45,6 @@ do_install () {
 }
 
 do_install () {
-        cd fbreader/${READER_ARCH}; oe_runmake .builddir RESOLUTION=${RESOLUTION}
+        cd fbreader/${READER_ARCH}; oe_runmake .builddir RESOLUTION=${READER_RESOLUTION}
 	cp -r data/* ${D}
 }
============================================================
--- packages/opie-reader/uqtreader_cvs.bb	b5eaf8da58651885a61786aed8e5b69735c2160b
+++ packages/opie-reader/uqtreader_cvs.bb	41cadc7ecb1fb1639efc6ee038608e24926313b3
@@ -1,8 +1,10 @@ LICENSE = "GPL"
 DESCRIPTION = "qt4-x11 opie-reader ebook reader port"
 SECTION = "x11/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
+inherit opie
+
 RRECOMMENDS="${PN}-filter-html"
 
 S = "${WORKDIR}/opie-reader"
============================================================
--- packages/perl/perl-native_5.8.8.bb	c0743df758d0d39ece2b86e2f02407860b131a37
+++ packages/perl/perl-native_5.8.8.bb	2f2d7163b1fd47aa9554cf3e954cd81ea1e73556
@@ -1,9 +1,9 @@ DEPENDS = "virtual/db-native gdbm-native
 DESCRIPTION = "Perl is a popular scripting language."
 HOMEPAGE = "http://www.perl.org/"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS = "virtual/db-native gdbm-native"
-PR = "r11"
+PR = "r12"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}"
 
@@ -14,9 +14,11 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/
            file://native-nopacklist.patch;patch=1 \
            file://native-no-gdbminc.patch;patch=1 \
            file://native-perlinc.patch;patch=1 \
-           file://native-makedepend-dash.patch;patch=1 \
-           file://native-ssp.patch;patch=1"
+           file://native-makedepend-dash.patch;patch=1"
 
+# This sloppy patch breaks normal gcc
+#           file://native-ssp.patch;patch=1
+
 S = "${WORKDIR}/perl-${PV}"
 
 inherit native
============================================================
--- packages/pptp-linux/pptp-linux_1.5.0.bb	558c8c16ff48470492bbadfaedc7ac5a7b4691fa
+++ packages/pptp-linux/pptp-linux_1.7.1.bb	263e08b1262191b23d77c94224359cdd4897e8af
@@ -1,33 +1,25 @@
-DESCRIPTION = "PPTP Client is a Linux, FreeBSD, NetBSD\
+DESCRIPTION = "PPTP Client is a Linux, FreeBSD, NetBSD \
 and OpenBSD client for the proprietary Microsoft Point-to-Point \
 Tunneling Protocol, PPTP. Allows connection to a PPTP based \
 Virtual Private Network (VPN) as used by employers and some \
 cable and ADSL internet service providers."
-LICENSE     = "GPL"
+HOMEPAGE = "http://pptpclient.sourceforge.net"
 SECTION = "network"
-PRIORITY    = "optional"
-DEPENDS     = "ppp "
+LICENSE = "GPL"
+RDEPENDS = "ppp"
+PR = "r0"
 
-inherit base
+SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \
+           file://options.pptp"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/pptpclient/pptp-linux-1.5.0.tar.gz \
-	   file://makefile.patch;patch=1 \
-	   file://options.pptp"
+S = "${WORKDIR}/pptp-${PV}"
 
-
-do_configure() {
-}
-
 do_compile() {
-	oe_runmake
+        oe_runmake
 }
-
 do_install() {
-	install -d ${D}${sbindir}
-	install -d ${D}/etc/
-	install -d ${D}/etc/ppp/
-
-	install -m 0755  pptp         ${D}${sbindir}/
-	install -m 0644 ${WORKDIR}/options.pptp ${D}/etc/ppp/
-
+        install -d ${D}${sbindir} ${D}${sysconfdir}/ppp ${D}${mandir}/man8
+        install -m 555 pptp ${D}${sbindir}
+        install -m 644 pptp.8 ${D}${mandir}/man8
+        install -m 644 ${WORKDIR}/options.pptp ${D}${sysconfdir}/ppp
 }
============================================================
--- packages/pulseaudio/pulse.inc	49cb20c18bb9950a2d327522824ef326b6c4a39a
+++ packages/pulseaudio/pulse.inc	dfb25678adb1d2a72abcc8ec418d2e951b8ff5ef
@@ -8,7 +8,7 @@ DEPENDS += "alsa-lib"
 # optional
 DEPENDS += "alsa-lib"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz"
 
@@ -28,31 +28,45 @@ PARALLEL_MAKE = ""
 
 PARALLEL_MAKE = ""
 
-export TARGET_FPU="${TARGET_FPU}"
+export TARGET_PFPU="${TARGET_FPU}"
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/default/volatiles
 	install -m 0644 ${WORKDIR}/volatiles.04_pulse  ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse
 	
-	if [ "x${TARGET_FPU}" == "xsoft" ] ; then 
+	if [ "x${TARGET_PFPU}" == "xsoft" ] ; then 
 	     sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf
 	fi
 }
 
 
-LEAD_SONAME = "libpulse.so"
+PACKAGES =+ "libpulsecore libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib pulseaudio-server \
+  	     pulseaudio-misc pulseaudio-gconf-helper"
 
-PACKAGES =+ "${PN}-bin ${PN}-conf"
+#upgrade path:
+RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
+
+
 PACKAGES_DYNAMIC = "pulseaudio-lib* pulseaudio-module* libpulse-lib* libpulse-module* "
 
+
+FILES_libpulsecore = "${libdir}/libpulsecore.so.*"
+FILES_libpulse = "${libdir}/libpulse.so.*"
+FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*"
+FILES_libpulse-browse = "${libdir}/libpulse-browse.so.*"
+FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*"
+				   	 
 FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \
                     ${libdir}/pulse-0.9/modules/.debug"
 FILES_${PN}-dev += "${libdir}/pulse-0.9/modules/*.la"		    
 FILES_${PN}-conf = "${sysconfdir}"
 FILES_${PN}-bin = "${bindir}/* \
                    ${sysconfdir}/default/volatiles/volatiles.04_pulse"
+FILES_${PN}-server = "${bindir}/pulseaudio ${sysconfdir}"
+FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper"
+FILES_${PN}-misc = "${bindir}/*"
 
-CONFFILES_${PN}-conf = "\ 
+CONFFILES_pulseaudio-server = "\ 
                        ${sysconfdir}/pulse/default.pa \
 		       ${sysconfdir}/pulse/daemon.conf \
 		       ${sysconfdir}/pulse/client.conf \
============================================================
--- packages/pulseaudio/pulseaudio_0.9.5.bb	a11c1056ff363bda7672ea63e72%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list