summaryrefslogtreecommitdiffstats
path: root/meta-moblin/packages
diff options
context:
space:
mode:
Diffstat (limited to 'meta-moblin/packages')
-rw-r--r--meta-moblin/packages/pulseaudio/libcanberra_0.10.bb3
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff19
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff15
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/autoconf_version.patch (renamed from meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch)12
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/buildfix.patch (renamed from meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch)0
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/gcc4-compile-fix.patch (renamed from meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch)0
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/volatiles.04_pulse (renamed from meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse)0
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio.inc35
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio_0.9.15.bb (renamed from meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb)6
9 files changed, 38 insertions, 52 deletions
diff --git a/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb b/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb
index 29751d9b9c..93f02c8459 100644
--- a/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb
+++ b/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb
@@ -1,11 +1,12 @@
1DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops." 1DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops."
2LICENSE = "LGPL" 2LICENSE = "LGPL"
3DEPENDS = "gtk+ pulseaudio alsa-lib libtool" 3DEPENDS = "gtk+ pulseaudio alsa-lib libtool"
4PR = "r2" 4PR = "r3"
5 5
6inherit gconf autotools 6inherit gconf autotools
7 7
8SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \ 8SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \
9 file://nofallbackfix.patch;patch=1 \
9 file://autoconf_version.patch;patch=1" 10 file://autoconf_version.patch;patch=1"
10 11
11EXTRA_OECONF = " --disable-oss --disable-ltdl-install" 12EXTRA_OECONF = " --disable-oss --disable-ltdl-install"
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff
deleted file mode 100644
index 666ed34ad3..0000000000
--- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff
+++ /dev/null
@@ -1,19 +0,0 @@
1from upstream svn r2113
2
3Index: configure.ac
4===================================================================
5--- configure.ac (wersja 2112)
6+++ configure.ac (wersja 2113)
7@@ -172,6 +172,12 @@
8 AC_SUBST(LIBLTDL)
9 AC_CONFIG_SUBDIRS(libltdl)
10
11+old_LIBS=$LIBS
12+LIBS="$LIBS $LIBLTDL"
13+AC_CHECK_FUNCS([lt_dlmutex_register])
14+LIBS=$old_LIBS
15+AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
16+
17 if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then
18 AC_MSG_ERROR([[
19
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff
deleted file mode 100644
index cbd82eeb84..0000000000
--- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff
+++ /dev/null
@@ -1,15 +0,0 @@
1from upstream svn r2114
2
3Index: configure.ac
4===================================================================
5--- configure.ac (wersja 2113)
6+++ configure.ac (wersja 2114)
7@@ -176,7 +176,7 @@
8 LIBS="$LIBS $LIBLTDL"
9 AC_CHECK_FUNCS([lt_dlmutex_register])
10 LIBS=$old_LIBS
11-AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
12+AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
13
14 if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then
15 AC_MSG_ERROR([[
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/autoconf_version.patch
index a3bc3c43c5..7a0759da13 100644
--- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/autoconf_version.patch
@@ -1,13 +1,13 @@
1Index: pulseaudio-0.9.12/configure.ac 1Index: pulseaudio-0.9.15/configure.ac
2=================================================================== 2===================================================================
3--- pulseaudio-0.9.12.orig/configure.ac 2009-04-16 14:52:38.000000000 +0100 3--- pulseaudio-0.9.15.orig/configure.ac 2009-04-14 00:09:53.000000000 +0100
4+++ pulseaudio-0.9.12/configure.ac 2009-04-16 14:52:46.000000000 +0100 4+++ pulseaudio-0.9.15/configure.ac 2009-05-22 11:32:50.000000000 +0100
5@@ -20,7 +20,7 @@ 5@@ -20,7 +20,7 @@
6 # along with PulseAudio; if not, write to the Free Software Foundation, 6 # along with PulseAudio; if not, write to the Free Software Foundation,
7 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. 7 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
8 8
9-AC_PREREQ(2.62) 9-AC_PREREQ(2.63)
10+AC_PREREQ(2.61) 10+AC_PREREQ(2.61)
11 11
12 m4_define(PA_MAJOR, [0]) 12 m4_define(pa_major, [0])
13 m4_define(PA_MINOR, [9]) 13 m4_define(pa_minor, [9])
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/buildfix.patch
index ca01e0d80f..ca01e0d80f 100644
--- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/buildfix.patch
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/gcc4-compile-fix.patch
index 34ad026e4d..34ad026e4d 100644
--- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/gcc4-compile-fix.patch
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/volatiles.04_pulse
index 5b1998032b..5b1998032b 100644
--- a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.15/volatiles.04_pulse
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio.inc b/meta-moblin/packages/pulseaudio/pulseaudio.inc
index 10ed8e26e9..7944095e46 100644
--- a/meta-moblin/packages/pulseaudio/pulseaudio.inc
+++ b/meta-moblin/packages/pulseaudio/pulseaudio.inc
@@ -3,9 +3,9 @@ HOMEPAGE = "http://www.pulseaudio.org"
3AUTHOR = "Lennart Poettering" 3AUTHOR = "Lennart Poettering"
4SECTION = "libs/multimedia" 4SECTION = "libs/multimedia"
5LICENSE = "LGPL" 5LICENSE = "LGPL"
6DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool hal" 6DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool hal virtual/libx11"
7# optional 7# optional
8DEPENDS += "alsa-lib glib-2.0" 8DEPENDS += "alsa-lib glib-2.0 dbus consolekit hal"
9 9
10SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ 10SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
11 file://gcc4-compile-fix.patch;patch=1 \ 11 file://gcc4-compile-fix.patch;patch=1 \
@@ -16,7 +16,8 @@ inherit autotools pkgconfig
16EXTRA_OECONF = "\ 16EXTRA_OECONF = "\
17 --disable-lynx \ 17 --disable-lynx \
18 --disable-bluez \ 18 --disable-bluez \
19 --without-x \ 19 --disable-polkit \
20 --with-x \
20 --without-jack \ 21 --without-jack \
21 --with-glib \ 22 --with-glib \
22 --with-alsa \ 23 --with-alsa \
@@ -61,12 +62,12 @@ FILES_libpulse-browse = "${libdir}/libpulse-browse.so.*"
61FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" 62FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*"
62 63
63FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \ 64FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \
64 ${libdir}/pulse-0.9/modules/.debug" 65 ${libdir}/pulse-${PV}/modules/.debug"
65FILES_${PN}-dev += "${libdir}/pulse-0.9/modules/*.la" 66FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la"
66FILES_${PN}-conf = "${sysconfdir}" 67FILES_${PN}-conf = "${sysconfdir}"
67FILES_${PN}-bin = "${bindir}/* \ 68FILES_${PN}-bin = "${bindir}/* \
68 ${sysconfdir}/default/volatiles/volatiles.04_pulse" 69 ${sysconfdir}/default/volatiles/volatiles.04_pulse"
69FILES_${PN}-server = "${bindir}/pulseaudio ${sysconfdir}" 70FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir}"
70FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper" 71FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper"
71FILES_${PN}-misc = "${bindir}/*" 72FILES_${PN}-misc = "${bindir}/*"
72 73
@@ -99,7 +100,27 @@ pkg_postrm_${PN}-server() {
99python populate_packages_prepend() { 100python populate_packages_prepend() {
100 #bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d) 101 #bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d)
101 102
102 plugindir = bb.data.expand('${libdir}/pulse-0.9/modules/', d) 103 plugindir = bb.data.expand('${libdir}/pulse-${PV}/modules/', d)
103 do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' ) 104 do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' )
104 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' ) 105 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
105} 106}
107
108RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
109RDEPENDS_pulseaudio-module-hal_detect =+ "hal"
110RDEPENDS_pulseaudio-server = " \
111 pulseaudio-module-device-restore \
112 pulseaudio-module-stream-restore \
113 pulseaudio-module-card-restore \
114 pulseaudio-module-augment-properties \
115 pulseaudio-module-detect \
116 pulseaudio-module-alsa-sink \
117 pulseaudio-module-alsa-source \
118 pulseaudio-module-native-protocol-unix \
119 pulseaudio-module-default-device-restore \
120 pulseaudio-module-rescue-streams \
121 pulseaudio-module-always-sink \
122 pulseaudio-module-suspend-on-idle \
123 pulseaudio-module-console-kit \
124 pulseaudio-module-position-event-sounds \
125 pulseaudio-module-cork-music-on-phone "
126
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb b/meta-moblin/packages/pulseaudio/pulseaudio_0.9.15.bb
index 8c8feb1ad1..14485901e7 100644
--- a/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb
+++ b/meta-moblin/packages/pulseaudio/pulseaudio_0.9.15.bb
@@ -1,14 +1,12 @@
1require pulseaudio.inc 1require pulseaudio.inc
2 2
3DEPENDS += "dbus gdbm speex" 3DEPENDS += "dbus gdbm speex"
4PR = "r1" 4PR = "r6"
5 5
6SRC_URI += "\ 6SRC_URI += "\
7 file://buildfix.patch;patch=1 \ 7 file://buildfix.patch;patch=1 \
8 file://autoconf_version.patch;patch=1 \ 8 file://autoconf_version.patch;patch=1 \
9 file://2113.diff;patch=1;pnum=0 \ 9"
10 file://2114.diff;patch=1;pnum=0 \
11"
12 10
13do_compile_prepend() { 11do_compile_prepend() {
14 cd ${S} 12 cd ${S}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 15:55:16 +0000