Branch packaging for Gemian

This commit is contained in:
TheKit 2019-11-13 13:40:25 +01:00 committed by Adam Boardman
parent d991352f66
commit 7090354d13
7 changed files with 8 additions and 42 deletions

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
pulseaudio-modules-droid (12.2.79+gemian) buster; urgency=medium
* Branch packaging for Gemian
-- TheKit <thekit@disroot.org> Wed, 13 Nov 2019 13:39:31 +0100
pulseaudio-modules-droid (12.2.79-3) unstable; urgency=medium pulseaudio-modules-droid (12.2.79-3) unstable; urgency=medium
* Fix pulseaudio droid module version * Fix pulseaudio droid module version

2
debian/control vendored
View file

@ -21,7 +21,7 @@ Vcs-Browser: https://gitlab.com/debian-pm/halium/pulseaudio-modules-droid
Package: pulseaudio-module-droid Package: pulseaudio-module-droid
Architecture: any Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends} Depends: ${misc:Depends}, ${shlibs:Depends}
Description: PulseAudio Droid HAL module. (JOLLA TEST VERSION) Description: PulseAudio Droid HAL module.
Package: pulseaudio-module-droid-dev Package: pulseaudio-module-droid-dev
Architecture: any Architecture: any

View file

@ -1,21 +0,0 @@
From fbbeb01162a59e198acc89f5330e6fe7d661c4d4 Mon Sep 17 00:00:00 2001
From: Marius Gripsgard <marius@ubports.com>
Date: Tue, 10 Apr 2018 01:48:14 +0200
Subject: [PATCH] Fix pkgconf for debian based systems.
Since debian based systems uses lib/{arch}/ as libdir and /usr/lib/pulse-* for modules this causes -L to search for -ldroid-utils in lib/{arch}/
---
src/common/libdroid-util.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/common/libdroid-util.pc.in b/src/common/libdroid-util.pc.in
index 523e4b0..32c77a1 100644
--- a/src/common/libdroid-util.pc.in
+++ b/src/common/libdroid-util.pc.in
@@ -7,5 +7,5 @@ libexecdir=@libexecdir@
Name: libdroid-util
Description: Common droid module building interface.
Version: @PA_MODULE_VERSION@
-Libs: -L${libdir}/pulse-@PA_MAJORMINOR@/modules -ldroid-util
+Libs: -L${prefix}/lib/pulse-@PA_MAJORMINOR@/modules -ldroid-util
Cflags: -D_REENTRANT -I${includedir}/pulsecore/modules

View file

@ -1,16 +0,0 @@
Description: Detect pulseaudio version from the system, don't assume it's always the same as the droid module's one
Author: Jonah Brüchert <jbb@kaidan.im>
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@
AM_PROG_CC_C_O
AC_PROG_GCC_TRADITIONAL
-m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`)
-m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`)
+m4_define(pa_major, `pkg-config --modversion libpulse | cut -d. -f1 | cut -d- -f1`)
+m4_define(pa_minor, `pkg-config --modversion libpulse | cut -d. -f2 | cut -d- -f1`)
m4_define(pa_module_version, `echo $VERSION | cut -d. -f3 | cut -d- -f1`)
AC_SUBST(PA_MAJOR, pa_major)

View file

@ -1,2 +0,0 @@
Fix-pkgconf-for-debian-based-systems.patch
detect-pulseaudio-version.patch

View file

@ -2,6 +2,5 @@ usr/lib/pulse-*/modules/libdroid-sink*.so
usr/lib/pulse-*/modules/libdroid-source*.so usr/lib/pulse-*/modules/libdroid-source*.so
usr/lib/pulse-*/modules/libdroid-util*.so usr/lib/pulse-*/modules/libdroid-util*.so
usr/lib/pulse-*/modules/module-droid-card*.so usr/lib/pulse-*/modules/module-droid-card*.so
usr/lib/pulse-*/modules/module-droid-keepalive*.so
usr/lib/pulse-*/modules/module-droid-sink*.so usr/lib/pulse-*/modules/module-droid-sink*.so
usr/lib/pulse-*/modules/module-droid-source*.so usr/lib/pulse-*/modules/module-droid-source*.so

View file

@ -1 +1 @@
3.0 (quilt) 3.0 (native)