From 1da3ddf1df96ca8b0672194734b2747feb2d4972 Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 18 Apr 2022 15:23:32 +0100 Subject: [PATCH] Add libvorbis-static package Signed-off-by: falkTX --- .../libs/libvorbis-static/debian/changelog | 5 ++++ sources/libs/libvorbis-static/debian/control | 24 ++++++++++++++++ ...-build-failure-with-DSO-link-changes.patch | 28 +++++++++++++++++++ ...d-SIGFPE-when-bytespersample-is-zero.patch | 26 +++++++++++++++++ .../debian/patches/9001-Fix-libs.patch | 28 +++++++++++++++++++ .../libvorbis-static/debian/patches/series | 3 ++ sources/libs/libvorbis-static/debian/rules | 27 ++++++++++++++++++ .../libvorbis-static/debian/source/format | 1 + 8 files changed, 142 insertions(+) create mode 100644 sources/libs/libvorbis-static/debian/changelog create mode 100644 sources/libs/libvorbis-static/debian/control create mode 100644 sources/libs/libvorbis-static/debian/patches/0001-Fix-build-failure-with-DSO-link-changes.patch create mode 100644 sources/libs/libvorbis-static/debian/patches/0002-Avoid-SIGFPE-when-bytespersample-is-zero.patch create mode 100644 sources/libs/libvorbis-static/debian/patches/9001-Fix-libs.patch create mode 100644 sources/libs/libvorbis-static/debian/patches/series create mode 100755 sources/libs/libvorbis-static/debian/rules create mode 100644 sources/libs/libvorbis-static/debian/source/format diff --git a/sources/libs/libvorbis-static/debian/changelog b/sources/libs/libvorbis-static/debian/changelog new file mode 100644 index 0000000..72a8ec8 --- /dev/null +++ b/sources/libs/libvorbis-static/debian/changelog @@ -0,0 +1,5 @@ +libvorbis-static (6:1.3.7-1kxstudio1) focal; urgency=medium + + * Initial package + + -- falkTX Sun, 17 Apr 2022 15:05:47 +0100 diff --git a/sources/libs/libvorbis-static/debian/control b/sources/libs/libvorbis-static/debian/control new file mode 100644 index 0000000..8d18bd2 --- /dev/null +++ b/sources/libs/libvorbis-static/debian/control @@ -0,0 +1,24 @@ +Source: libvorbis-static +Section: libs +Priority: optional +Maintainer: falkTX +Build-Depends: debhelper-compat (= 13), + kxstudio-build-scripts, + autoconf, + automake, + libtool, + pkg-config, + libogg-static (>= 6:1.3.5-1kxstudio1) +Standards-Version: 4.5.0 +Homepage: https://xiph.org/vorbis/ +Rules-Requires-Root: no + +Package: libvorbis-static +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libogg-static +Description: Vorbis General Audio Compression Codec (static) + Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, + general-purpose compressed audio format for audio and music at fixed + and variable bitrates from 16 to 128 kbps/channel. + . + This package provides the static library used in KXStudio builds. diff --git a/sources/libs/libvorbis-static/debian/patches/0001-Fix-build-failure-with-DSO-link-changes.patch b/sources/libs/libvorbis-static/debian/patches/0001-Fix-build-failure-with-DSO-link-changes.patch new file mode 100644 index 0000000..22a1de0 --- /dev/null +++ b/sources/libs/libvorbis-static/debian/patches/0001-Fix-build-failure-with-DSO-link-changes.patch @@ -0,0 +1,28 @@ +Forwarded: https://github.com/xiph/vorbis/pull/65 +From: Matthias Klose +Date: Mon, 11 Oct 2010 10:32:05 +0200 +Subject: Fix build failure with DSO link changes. + +Make sure to link tests with -lm to fix linker error. + +Origin: http://launchpadlibrarian.net/57621522/libvorbis_1.3.1-1_1.3.1-1ubuntu1.diff.gz +Bug-Debian: http://bugs.debian.org/604797 +Reviewed-By: Petter Reinholdtsen +Last-Update: 2014-10-14 +--- + test/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: libvorbis/test/Makefile.am +=================================================================== +--- libvorbis.orig/test/Makefile.am 2018-03-22 08:15:14.098604347 +0100 ++++ libvorbis/test/Makefile.am 2018-03-22 08:15:14.094604308 +0100 +@@ -10,7 +10,7 @@ + AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@ + + test_SOURCES = util.c util.h write_read.c write_read.h test.c +-test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@ @VORBIS_LIBS@ ++test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@ @VORBIS_LIBS@ -lm + + debug: + $(MAKE) check CFLAGS="@DEBUG@" diff --git a/sources/libs/libvorbis-static/debian/patches/0002-Avoid-SIGFPE-when-bytespersample-is-zero.patch b/sources/libs/libvorbis-static/debian/patches/0002-Avoid-SIGFPE-when-bytespersample-is-zero.patch new file mode 100644 index 0000000..15856b6 --- /dev/null +++ b/sources/libs/libvorbis-static/debian/patches/0002-Avoid-SIGFPE-when-bytespersample-is-zero.patch @@ -0,0 +1,26 @@ +From: Daniel Exner +Date: Mon, 18 Jun 2012 22:05:48 +0200 +Subject: Avoid SIGFPE when bytespersample is zero + +Forwarded: https://github.com/xiph/vorbis/pull/66 +Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635906#15 +Reviewed-By: Petter Reinholdtsen +Last-Update: 2020-08-24 +--- + lib/vorbisfile.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: libvorbis/lib/vorbisfile.c +=================================================================== +--- libvorbis.orig/lib/vorbisfile.c ++++ libvorbis/lib/vorbisfile.c +@@ -1992,7 +1992,8 @@ long ov_read_filter(OggVorbis_File *vf,c + vorbis_fpu_control fpu; + + if(channels<1||channels>255)return(OV_EINVAL); +- if(samples>length/bytespersample)samples=length/bytespersample; ++ if(bytespersample && samples>length/bytespersample) ++ samples=length/bytespersample; + + if(samples <= 0) + return OV_EINVAL; diff --git a/sources/libs/libvorbis-static/debian/patches/9001-Fix-libs.patch b/sources/libs/libvorbis-static/debian/patches/9001-Fix-libs.patch new file mode 100644 index 0000000..d7b62b9 --- /dev/null +++ b/sources/libs/libvorbis-static/debian/patches/9001-Fix-libs.patch @@ -0,0 +1,28 @@ +--- libvorbis-static-1.3.4.orig/vorbis.pc.in ++++ libvorbis-static-1.3.4/vorbis.pc.in +@@ -10,6 +10,6 @@ Description: vorbis is the primary Ogg V + Version: @VERSION@ + Requires.private: ogg + Conflicts: +-Libs: -L${libdir} -lvorbis ++Libs: -L${libdir} -lvorbis -logg -lm + Libs.private: @VORBIS_LIBS@ + Cflags: -I${includedir} +--- libvorbis-static-1.3.4.orig/vorbisenc.pc.in ++++ libvorbis-static-1.3.4/vorbisenc.pc.in +@@ -10,5 +10,5 @@ Description: vorbisenc is a library that + Version: @VERSION@ + Requires.private: vorbis + Conflicts: +-Libs: -L${libdir} -lvorbisenc ++Libs: -L${libdir} -lvorbisenc -lvorbis -logg -lm + Cflags: -I${includedir} +--- libvorbis-static-1.3.4.orig/vorbisfile.pc.in ++++ libvorbis-static-1.3.4/vorbisfile.pc.in +@@ -10,5 +10,5 @@ Description: vorbisfile is a library tha + Version: @VERSION@ + Requires.private: vorbis + Conflicts: +-Libs: -L${libdir} -lvorbisfile ++Libs: -L${libdir} -lvorbisfile -lvorbis -logg -lm + Cflags: -I${includedir} diff --git a/sources/libs/libvorbis-static/debian/patches/series b/sources/libs/libvorbis-static/debian/patches/series new file mode 100644 index 0000000..3cdfa7a --- /dev/null +++ b/sources/libs/libvorbis-static/debian/patches/series @@ -0,0 +1,3 @@ +0001-Fix-build-failure-with-DSO-link-changes.patch +0002-Avoid-SIGFPE-when-bytespersample-is-zero.patch +9001-Fix-libs.patch diff --git a/sources/libs/libvorbis-static/debian/rules b/sources/libs/libvorbis-static/debian/rules new file mode 100755 index 0000000..ed61797 --- /dev/null +++ b/sources/libs/libvorbis-static/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +KXSTUDIO_NO_FASTMATH = y +include /usr/share/dpkg/kxstudio.mk + +override_dh_auto_configure: + ./configure --disable-maintainer-mode \ + --prefix=/opt/kxstudio \ + --enable-static \ + --disable-shared \ + --disable-docs \ + --disable-examples + +override_dh_auto_test: + # tests fail with multiple jobs + dh_auto_test -- -j1 + +override_dh_auto_install: + dh_auto_install + # remove unwanted files + rm $(CURDIR)/debian/libvorbis-static/opt/kxstudio/lib/libvorbis.la + rm $(CURDIR)/debian/libvorbis-static/opt/kxstudio/lib/libvorbisenc.la + rm $(CURDIR)/debian/libvorbis-static/opt/kxstudio/lib/libvorbisfile.la + rm -r $(CURDIR)/debian/libvorbis-static/opt/kxstudio/share/doc + +%: + dh $@ diff --git a/sources/libs/libvorbis-static/debian/source/format b/sources/libs/libvorbis-static/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/sources/libs/libvorbis-static/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt)