diff -Nru libomxcamera-0.1/debian/changelog libomxcamera-0.1/debian/changelog --- libomxcamera-0.1/debian/changelog 2014-10-05 21:03:00.000000000 +0000 +++ libomxcamera-0.1/debian/changelog 2020-09-10 12:18:48.000000000 +0000 @@ -1,14 +1,12 @@ -libomxcamera (0.1-2ubuntu2) utopic; urgency=medium +libomxcamera (0.1-3) unstable; urgency=low - * Use autotools-dev to update config.{sub,guess} for new arches. + * 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 - -- Logan Rosen Sun, 05 Oct 2014 17:02:50 -0400 - -libomxcamera (0.1-2ubuntu1) precise; urgency=low - - * Turn off -Werror during configuration. Fixes FTBFS. - - -- Ilya Barygin Mon, 31 Oct 2011 21:03:01 +0400 + -- Ying-Chun Liu (PaulLiu) Thu, 10 Sep 2020 20:18:48 +0800 libomxcamera (0.1-2) unstable; urgency=low diff -Nru libomxcamera-0.1/debian/clean libomxcamera-0.1/debian/clean --- libomxcamera-0.1/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ libomxcamera-0.1/debian/clean 2020-09-10 12:18:48.000000000 +0000 @@ -0,0 +1 @@ +config.log \ No newline at end of file diff -Nru libomxcamera-0.1/debian/compat libomxcamera-0.1/debian/compat --- libomxcamera-0.1/debian/compat 2011-07-27 16:18:24.000000000 +0000 +++ libomxcamera-0.1/debian/compat 2020-09-10 12:12:59.000000000 +0000 @@ -1 +1 @@ -7 +11 diff -Nru libomxcamera-0.1/debian/control libomxcamera-0.1/debian/control --- libomxcamera-0.1/debian/control 2011-10-31 17:04:01.000000000 +0000 +++ libomxcamera-0.1/debian/control 2020-09-10 12:18:48.000000000 +0000 @@ -1,11 +1,10 @@ Source: libomxcamera Section: libs Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Ying-Chun Liu (PaulLiu) -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libomxil-bellagio-dev, +Maintainer: Ying-Chun Liu (PaulLiu) +Build-Depends: debhelper (>= 11), libomxil-bellagio-dev, pkg-config -Standards-Version: 3.9.2 +Standards-Version: 4.5.0 Homepage: http://omxil.sourceforge.net/ Package: libomxil-bellagio0-components-camera diff -Nru libomxcamera-0.1/debian/patches/02_Werror.patch libomxcamera-0.1/debian/patches/02_Werror.patch --- libomxcamera-0.1/debian/patches/02_Werror.patch 1970-01-01 00:00:00.000000000 +0000 +++ libomxcamera-0.1/debian/patches/02_Werror.patch 2020-09-10 12:18:48.000000000 +0000 @@ -0,0 +1,33 @@ +Description: turn on -Werror during configuration to fix FTBFS + Allow warnings during configuration, otherwise it fails: + configure:11768: gcc -o conftest -g -O2 -fstack-protector + --param=ssp-buffer-size=4 -Wformat -Wformat-security + -Wno-error=unused-but-set-variable -Werror -D_FORTIFY_SOURCE=2 + -Wl,-Bsymbolic-functions -Wl,-z,relro conftest.c -lpthread >&5 + conftest.c: In function 'main': + conftest.c:27:22: error: null argument where non-null required (argument 1) + [-Werror=nonnull] + conftest.c:28:22: error: null argument where non-null required (argument 1) + [-Werror=nonnull] + conftest.c:28:22: error: null argument where non-null required (argument 3) + [-Werror=nonnull] + cc1: all warnings being treated as errors +Author: Ilya Barygin +Reviewed-By: Ying-Chun Liu (PaulLiu) +Last-Update: 2020-09-10 + +--- libomxcamera-0.1.orig/configure.ac ++++ libomxcamera-0.1/configure.ac +@@ -1,3 +1,4 @@ ++ + AC_INIT([OpenMAX Motorola Camera Component ], [0.1], [], [libomxcamera]) + AM_INIT_AUTOMAKE([tar-ustar]) + +@@ -9,7 +10,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 libomxcamera-0.1/debian/patches/series libomxcamera-0.1/debian/patches/series --- libomxcamera-0.1/debian/patches/series 2011-10-31 17:04:15.000000000 +0000 +++ libomxcamera-0.1/debian/patches/series 2020-09-10 12:18:48.000000000 +0000 @@ -1,2 +1,2 @@ 01_fix_64bit_FTBFS.patch -Werror.patch +02_Werror.patch diff -Nru libomxcamera-0.1/debian/patches/Werror.patch libomxcamera-0.1/debian/patches/Werror.patch --- libomxcamera-0.1/debian/patches/Werror.patch 2011-10-31 17:06:48.000000000 +0000 +++ libomxcamera-0.1/debian/patches/Werror.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -Description: turn on -Werror during configuration to fix FTBFS - Allow warnings during configuration, otherwise it fails: - configure:11768: gcc -o conftest -g -O2 -fstack-protector - --param=ssp-buffer-size=4 -Wformat -Wformat-security - -Wno-error=unused-but-set-variable -Werror -D_FORTIFY_SOURCE=2 - -Wl,-Bsymbolic-functions -Wl,-z,relro conftest.c -lpthread >&5 - conftest.c: In function 'main': - conftest.c:27:22: error: null argument where non-null required (argument 1) - [-Werror=nonnull] - conftest.c:28:22: error: null argument where non-null required (argument 1) - [-Werror=nonnull] - conftest.c:28:22: error: null argument where non-null required (argument 3) - [-Werror=nonnull] - cc1: all warnings being treated as errors -Author: Ilya Barygin - ---- libomxcamera-0.1.orig/configure -+++ libomxcamera-0.1/configure -@@ -2839,7 +2839,6 @@ fi - - ac_config_headers="$ac_config_headers config.h" - --CFLAGS="${CFLAGS} -Werror" - - - ################################################################################ ---- libomxcamera-0.1.orig/configure.ac -+++ libomxcamera-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 libomxcamera-0.1/debian/rules libomxcamera-0.1/debian/rules --- libomxcamera-0.1/debian/rules 2014-10-05 21:02:45.000000000 +0000 +++ libomxcamera-0.1/debian/rules 2020-09-10 12:18:48.000000000 +0000 @@ -5,10 +5,10 @@ #export DH_VERBOSE=1 %: - dh $@ --with autotools_dev + 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 CFLAGS="$(CFLAGS) -Wno-error=unused-but-set-variable" override_dh_makeshlibs: dh_makeshlibs -Xlibomx diff -Nru libomxcamera-0.1/debian/tests/control libomxcamera-0.1/debian/tests/control --- libomxcamera-0.1/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ libomxcamera-0.1/debian/tests/control 2020-09-10 12:18:48.000000000 +0000 @@ -0,0 +1,5 @@ +Tests: test-registry-file +Depends: @, libomxil-bellagio-bin + +Tests: listcomponents-bellagio +Depends: @, libomxil-bellagio-bin, gstreamer1.0-omx-bellagio-config, gstreamer1.0-omx-generic, gst-omx-listcomponents, libomxil-bellagio0-components-base diff -Nru libomxcamera-0.1/debian/tests/listcomponents-bellagio libomxcamera-0.1/debian/tests/listcomponents-bellagio --- libomxcamera-0.1/debian/tests/listcomponents-bellagio 1970-01-01 00:00:00.000000000 +0000 +++ libomxcamera-0.1/debian/tests/listcomponents-bellagio 2020-09-10 12:18:48.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.v4l.camera_source" "$TDIR"/list1.txt +if [ $? -eq 0 ] ; then + echo "Pass - OMX.st.v4l.camera_source" +else + echo "Fail - OMX.st.v4l.camera_source" + exit 4 +fi diff -Nru libomxcamera-0.1/debian/tests/test-registry-file libomxcamera-0.1/debian/tests/test-registry-file --- libomxcamera-0.1/debian/tests/test-registry-file 1970-01-01 00:00:00.000000000 +0000 +++ libomxcamera-0.1/debian/tests/test-registry-file 2020-09-10 12:18:48.000000000 +0000 @@ -0,0 +1,25 @@ +#!/bin/sh + +REGISTRYFILE="/var/lib/libomxil-bellagio0/registry" + +if [ ! -f "$REGISTRYFILE" ]; then + exit 404 +fi + +grep -q "libomxcamera.so" "$REGISTRYFILE" +if [ $? -eq 0 ] ; then + echo "Pass - libomxcamera.so" +else + echo "Fail - libomxcamera.so" + exit 1 +fi + +grep -q "OMX.st.v4l.camera_source" "$REGISTRYFILE" +if [ $? -eq 0 ] ; then + echo "Pass - OMX.st.v4l.camera_source" +else + echo "Fail - OMX.st.v4l.camera_source" + exit 4 +fi + +exit