diff -Nru libomxvorbis-0.1/debian/changelog libomxvorbis-0.1/debian/changelog --- libomxvorbis-0.1/debian/changelog 2011-07-20 03:34:42.000000000 +0000 +++ libomxvorbis-0.1/debian/changelog 2020-09-13 18:09:11.000000000 +0000 @@ -1,3 +1,15 @@ +libomxvorbis (0.1-4) unstable; urgency=low + + * Bump debhelper version to 11 + * Bump Standards-Version to 4.5.0: nothing needs to be changed + * Add debian/patches/02_Werror.patch: fix FTBFS + * Implement multi-arch + * Add autopkgtest + * Fix FTBFS on systems with older gcc (Closes: #645374) + - We don't use -Wno-error=unused-but-set-variable anymore + + -- Ying-Chun Liu (PaulLiu) Mon, 14 Sep 2020 02:09:11 +0800 + libomxvorbis (0.1-3) unstable; urgency=low * debian/rules: Fix FTBFS for gcc-4.6 (Closes: #625370) diff -Nru libomxvorbis-0.1/debian/clean libomxvorbis-0.1/debian/clean --- libomxvorbis-0.1/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ libomxvorbis-0.1/debian/clean 2020-09-13 18:08:45.000000000 +0000 @@ -0,0 +1 @@ +config.log \ No newline at end of file diff -Nru libomxvorbis-0.1/debian/compat libomxvorbis-0.1/debian/compat --- libomxvorbis-0.1/debian/compat 2011-03-07 15:07:42.000000000 +0000 +++ libomxvorbis-0.1/debian/compat 2020-09-13 18:09:11.000000000 +0000 @@ -1 +1 @@ -7 +11 diff -Nru libomxvorbis-0.1/debian/control libomxvorbis-0.1/debian/control --- libomxvorbis-0.1/debian/control 2011-07-20 03:32:46.000000000 +0000 +++ libomxvorbis-0.1/debian/control 2020-09-13 18:09:11.000000000 +0000 @@ -2,14 +2,16 @@ Section: libs Priority: optional Maintainer: Ying-Chun Liu (PaulLiu) -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libomxil-bellagio-dev, - libvorbis-dev, pkg-config -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 11), + libomxil-bellagio-dev, + libvorbis-dev, + pkg-config +Standards-Version: 4.5.0 Homepage: http://omxil.sourceforge.net/ Package: libomxil-bellagio0-components-vorbis Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: vorbis decoder components for Bellagio OpenMAX IL OpenMAX Integration Layer (IL) is a standard API to access Multimedia Components on mobile platforms. It has been defined by the Khronos diff -Nru libomxvorbis-0.1/debian/patches/02_Werror.patch libomxvorbis-0.1/debian/patches/02_Werror.patch --- libomxvorbis-0.1/debian/patches/02_Werror.patch 1970-01-01 00:00:00.000000000 +0000 +++ libomxvorbis-0.1/debian/patches/02_Werror.patch 2020-09-13 18:09:11.000000000 +0000 @@ -0,0 +1,17 @@ +Description: remove -Werror during configuration to fix FTBFS + Allow warnings during configuration +Author: Ying-Chun Liu (PaulLiu) +Last-Update: 2020-09-13 + +Index: libomxvorbis-0.1/configure.ac +=================================================================== +--- libomxvorbis-0.1.orig/configure.ac ++++ libomxvorbis-0.1/configure.ac +@@ -9,7 +9,6 @@ AC_SUBST(OMXIL_CFLAGS) + AC_SUBST(OMXIL_LIBS) + + AC_CONFIG_HEADERS([config.h]) +-CFLAGS="${CFLAGS} -Werror" + AC_PREFIX_DEFAULT(/usr/local/lib/extern_omxcomp) + + ################################################################################ diff -Nru libomxvorbis-0.1/debian/patches/series libomxvorbis-0.1/debian/patches/series --- libomxvorbis-0.1/debian/patches/series 2011-07-20 03:32:09.000000000 +0000 +++ libomxvorbis-0.1/debian/patches/series 2020-09-13 18:09:11.000000000 +0000 @@ -1 +1,2 @@ fix_printf_pointer.patch +02_Werror.patch diff -Nru libomxvorbis-0.1/debian/rules libomxvorbis-0.1/debian/rules --- libomxvorbis-0.1/debian/rules 2011-07-20 03:29:26.000000000 +0000 +++ libomxvorbis-0.1/debian/rules 2020-09-13 18:09:11.000000000 +0000 @@ -8,7 +8,7 @@ dh $@ override_dh_auto_configure: - dh_auto_configure -- --libdir=/usr/lib/libomxil-bellagio0 CFLAGS="$(CFLAGS) -Wno-error=unused-but-set-variable" + dh_auto_configure -- --libdir=/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/libomxil-bellagio0 override_dh_makeshlibs: dh_makeshlibs -Xlibomx diff -Nru libomxvorbis-0.1/debian/tests/control libomxvorbis-0.1/debian/tests/control --- libomxvorbis-0.1/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ libomxvorbis-0.1/debian/tests/control 2020-09-13 18:09:11.000000000 +0000 @@ -0,0 +1,10 @@ +Tests: test-registry-file +Depends: libomxil-bellagio-bin, @ + +Tests: listcomponents-bellagio +Depends: gst-omx-listcomponents, + gstreamer1.0-omx-bellagio-config, + gstreamer1.0-omx-generic, + libomxil-bellagio-bin, + libomxil-bellagio0-components-base, + @ diff -Nru libomxvorbis-0.1/debian/tests/listcomponents-bellagio libomxvorbis-0.1/debian/tests/listcomponents-bellagio --- libomxvorbis-0.1/debian/tests/listcomponents-bellagio 1970-01-01 00:00:00.000000000 +0000 +++ libomxvorbis-0.1/debian/tests/listcomponents-bellagio 2020-09-13 18:09:11.000000000 +0000 @@ -0,0 +1,30 @@ +#!/bin/sh + +set -e + +DEB_BUILD_MULTIARCH=`dpkg-architecture -qDEB_BUILD_MULTIARCH` +TEMP=${AUTOPKGTEST_TMP:-${TMPDIR:-$(mktemp -d)}} +TDIR=$(mktemp -d $TEMP/lscompbellXXXXXX) + +if [ -e /usr/lib/"$DEB_BUILD_MULTIARCH"/libomxil-bellagio.so.0 ]; then + echo "Test for multi-arch" + gst-omx-listcomponents \ + /usr/lib/"$DEB_BUILD_MULTIARCH"/libomxil-bellagio.so.0 \ + > "$TDIR"/list1.txt +elif [ -e /usr/lib/libomxil-bellagio.so.0 ]; then + echo "Test for non-multiarch" + gst-omx-listcomponents \ + /usr/lib/libomxil-bellagio.so.0 \ + > "$TDIR"/list1.txt +else + echo "Did not found libomxil-bellagio.so.0" + exit 1 +fi + +grep -q "OMX.st.audio_decoder.ogg.single" "$TDIR"/list1.txt +if [ $? -eq 0 ] ; then + echo "Pass - OMX.st.audio_decoder.ogg.single" +else + echo "Fail - OMX.st.audio_decoder.ogg.single" + exit 4 +fi diff -Nru libomxvorbis-0.1/debian/tests/test-registry-file libomxvorbis-0.1/debian/tests/test-registry-file --- libomxvorbis-0.1/debian/tests/test-registry-file 1970-01-01 00:00:00.000000000 +0000 +++ libomxvorbis-0.1/debian/tests/test-registry-file 2020-09-13 18:09:11.000000000 +0000 @@ -0,0 +1,25 @@ +#!/bin/sh + +REGISTRYFILE="/var/lib/libomxil-bellagio0/registry" + +if [ ! -f "$REGISTRYFILE" ]; then + exit 404 +fi + +grep -q "libomxvorbis.so" "$REGISTRYFILE" +if [ $? -eq 0 ] ; then + echo "Pass - libomxvorbis.so" +else + echo "Fail - libomxvorbis.so" + exit 1 +fi + +grep -q "OMX.st.audio_decoder.ogg.single" "$REGISTRYFILE" +if [ $? -eq 0 ] ; then + echo "Pass - OMX.st.audio_decoder.ogg.single" +else + echo "Fail - OMX.st.audio_decoder.ogg.single" + exit 4 +fi + +exit