summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorQue Quotion2019-03-09 07:39:33 +0900
committerQue Quotion2019-03-09 07:39:33 +0900
commit21d06ad12e11a882d415b5cc5237ce8889ff17d7 (patch)
tree183994bf54d00809d8f2f61e0e490ea1b9e9ee98
parent94dd1cf2c3cfd4a43ba26e92680a4cc283da5ee1 (diff)
downloadaur-21d06ad12e11a882d415b5cc5237ce8889ff17d7.tar.gz
Fix jack/jack2-dbus conflict (had 'jack' depends, 'jack2-dbus' in makedepends; why?); fix incomplete libtool.
-rwxr-xr-x.SRCINFO6
-rw-r--r--PKGBUILD15
-rw-r--r--fixlibtool10
3 files changed, 24 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d37d29ba808..cda4b5799da 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = pulseaudio-git
pkgdesc = A featureful, general-purpose sound server (development version)
- pkgver = v12.0.260.g7525cc821
+ pkgver = v12.0.271.g904dd3800
pkgrel = 1
url = http://pulseaudio.org/
arch = i686
@@ -48,12 +48,12 @@ pkgbase = pulseaudio-git
depends = tdb
depends = orc
depends = webrtc-audio-processing
+ depends = jack2-dbus
depends = dbus
depends = systemd
depends = avahi
depends = openssl
depends = lirc
- depends = jack
depends = bluez
depends = bluez-libs
depends = sbc
@@ -84,7 +84,9 @@ pkgbase = pulseaudio-git
backup = etc/pulse/system.pa
backup = etc/pulse/client.conf
source = git+git://anongit.freedesktop.org/pulseaudio/pulseaudio
+ source = fixlibtool
sha256sums = SKIP
+ sha256sums = 8478cb2b495d3ef4844b700140d04ecbcbeb06d5d7bdae5308dec2b74a2c59c4
pkgname = pulseaudio-git
diff --git a/PKGBUILD b/PKGBUILD
index 519d95011ac..02633965939 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,14 +10,14 @@
_pkgname="pulseaudio"
pkgname="$_pkgname-git"
pkgdesc="A featureful, general-purpose sound server (development version)"
-pkgver=v12.0.260.g7525cc821
+pkgver=v12.0.271.g904dd3800
pkgrel=1
arch=("i686" "x86_64" "armv7h")
url="http://pulseaudio.org/"
license=("GPL" "LGPL")
depends=(lib{ltdl,soxr,asyncns,cap,xtst,sm,sndfile} "rtkit" "speexdsp" "tdb"
- "orc" "webrtc-audio-processing" "dbus" "systemd" "avahi" "openssl"
- "lirc" "jack" bluez{,-libs} "sbc" python-{pyqt5,dbus,sip} "fftw") #json-c
+ "orc" "webrtc-audio-processing" {jack2-,}dbus "systemd" "avahi" "openssl"
+ "lirc" bluez{,-libs} "sbc" python-{pyqt5,dbus,sip} "fftw") #json-c
makedepends=("git" lib{asyncns,cap,xtst,sm,sndfile,tool,soxr} "attr" "rtkit"
"speexdsp" "tdb" "systemd" {jack2-,}dbus "avahi" bluez{,-libs}
"intltool" "sbc" "lirc" "openssl" "fftw" "orc" "gtk3"
@@ -29,8 +29,10 @@ backup=(etc/pulse/{daemon.conf,default.pa,system.pa,client.conf})
provides=(pulseaudio{,-{zeroconf,lirc,jack,bluetooth,equalizer}} "libpulse") #"pulseaudio-xen" "pulseaudio-gconf"
conflicts=(pulseaudio{,-{zeroconf,lirc,jack,bluetooth,equalizer}} "libpulse") #"pulseaudio-xen" "pulseaudio-gconf"
options=(!emptydirs)
-source=("git+git://anongit.freedesktop.org/pulseaudio/pulseaudio")
-sha256sums=("SKIP")
+source=("git+git://anongit.freedesktop.org/pulseaudio/pulseaudio"
+ 'fixlibtool')
+sha256sums=('SKIP'
+ '8478cb2b495d3ef4844b700140d04ecbcbeb06d5d7bdae5308dec2b74a2c59c4')
pkgver() {
cd "$srcdir/$_pkgname"
@@ -58,6 +60,9 @@ build() {
--disable-default-build-tests \
DATADIRNAME=share
+ #Incomplete libtool breaks LTO, possibly other things.
+ #patch -Np2 < ../fixlibtool
+
# fight unused direct deps
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
diff --git a/fixlibtool b/fixlibtool
new file mode 100644
index 00000000000..45d4e65ee9e
--- /dev/null
+++ b/fixlibtool
@@ -0,0 +1,10 @@
+--- src/pulseaudio/libtool 2019-03-08 23:19:38.517861857 +0900
++++ src/pulseaudio/libtool 2019-03-08 23:36:25.137849805 +0900
+@@ -176,5 +176,5 @@
+ # Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=""
++global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'"
+
+ # Transform the output of nm in a proper C declaration.
+-global_symbol_to_cdecl=""
++global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[ABCDGIRSTW][ABCDGIRSTW]* .* \\(.*\\)\$/extern char \\1;/p'"