From: Antonio Ospite Date: Thu, 15 May 2014 10:50:18 +0000 (+0200) Subject: Merge tag 'v0.1.5' into debian X-Git-Tag: debian/0.1.5-1~13 X-Git-Url: https://git.ao2.it/libam7xxx.git/commitdiff_plain/18abce2d438f825a38f52df6d904088adda4c890?hp=dadc58ab9891dc5dfc60f9e2070330d60f3ceed8 Merge tag 'v0.1.5' into debian Release version 0.1.5 --- diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..dfdf2fb --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,6 @@ + +Permission to access am7xxx devices +=================================== + +The access to am7xxx devices is granted to any user belonging to the +"plugdev" group. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..8d2dd2b --- /dev/null +++ b/debian/changelog @@ -0,0 +1,47 @@ +libam7xxx (0.1.4-3) unstable; urgency=medium + + * debian/control: remove versions from libav dependencies + * debian/patches: add 0003-CMakeLists.txt-define-DEBUG-1-only-when-CMAKE_BUILD_.patch + * debian/control: drop the version on the asciidoc dependency + * debian/gbp.conf: explicitly disable pristine-tar + * debian/control: bump Standards-Version to 3.9.5 + * debian/control: specify the debian package branch in Vcs-Git + * debian/control: drop the am7xxx metapackage + * debian/patches: add 0004-Revert-am7xxx-use-the-symbolic-constant-for-libusb-l.patch + + -- Antonio Ospite Wed, 29 Jan 2014 15:29:28 +0100 + +libam7xxx (0.1.4-2) unstable; urgency=low + + * debian/patches: add 0002-am7xxx-add-quirks-for-Philips-Sagemcom-PicoPix-2055.patch + + -- Antonio Ospite Sat, 03 Aug 2013 16:27:13 +0200 + +libam7xxx (0.1.4-1) unstable; urgency=low + + * New upstream release + * debian/patches: refresh patches for v0.1.4 + * debian/libam7xxx0.1.symbols: add the am7xxx_send_image_async symbol + * debian/control: update the list of supported devices + * debian/control: fix a not-binnmuable-any-depends-all lintian error + * debian/control: update Standards-Version to 3.9.4 + + -- Antonio Ospite Sun, 28 Jul 2013 22:39:42 +0200 + +libam7xxx (0.1.3-1) unstable; urgency=low + + * New upstream release + * debian/libam7xxx0.1.symbols: add the am7xxx_set_zoom_mode symbol + * debian/patches: add patch 0001 for a missing man page + * debian/control: update the list of supported devices + * debian: add a package for debug symbols + * debian/patches: add 0002-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch + * debian/control: restrict the version also for the other libav libraries + + -- Antonio Ospite Mon, 18 Mar 2013 14:04:14 +0100 + +libam7xxx (0.1.2-1) unstable; urgency=low + + * Initial release (Closes: #666075) + + -- Antonio Ospite Wed, 28 Mar 2012 16:51:54 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..87a8cd3 --- /dev/null +++ b/debian/control @@ -0,0 +1,134 @@ +Source: libam7xxx +Section: libdevel +Priority: extra +Maintainer: Antonio Ospite +Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), cmake, pkg-config, + libusb-1.0-0-dev, libxcb1-dev, + libavdevice-dev, libavformat-dev, libavcodec-dev, libswscale-dev +Build-Depends-Indep: doxygen, asciidoc, xmlto +Standards-Version: 3.9.5 +Homepage: http://git.ao2.it/libam7xxx.git +Vcs-Git: git://git.ao2.it/libam7xxx.git -b debian +Vcs-Browser: http://git.ao2.it/libam7xxx.git + +Package: libam7xxx0.1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: libam7xxx0.1-bin (= ${binary:Version}), usb-modeswitch, usb-modeswitch-data (>= 20111023-1) +Description: library for accessing am7xxx based devices + libam7xxx is an Open Source library to communicate via USB with projectors and + Digital Picture Frames based on the Actions Micro AM7XXX family if ICs. + . + libam7xxx makes it possible to use these devices as USB displays on + non-Windows Operating Systems like GNU/Linux or Android/Linux just to name + a few, and on non-PC platforms like for instance mobile phones, tablets or + game consoles. + . + Examples of supported devices are: + - Acer C110 + - Acer C112 + - Aiptek PocketCinema T25 + - Philips/SagemCom PicoPix 1020 + - Philips/SagemCom PicoPix 2055 + - Philips/SagemCom PicoPix 2330 + - Top-Height/TEC PP700 + . + This package contains the shared library of libam7xxx. + +Package: libam7xxx0.1-dbg +Section: debug +Architecture: any +Depends: ${misc:Depends}, libam7xxx0.1 (= ${binary:Version}) +Description: debugging symbols for libam7xxx + libam7xxx is an Open Source library to communicate via USB with projectors and + Digital Picture Frames based on the Actions Micro AM7XXX family if ICs. + . + libam7xxx makes it possible to use these devices as USB displays on + non-Windows Operating Systems like GNU/Linux or Android/Linux just to name + a few, and on non-PC platforms like for instance mobile phones, tablets or + game consoles. + . + Examples of supported devices are: + - Acer C110 + - Acer C112 + - Aiptek PocketCinema T25 + - Philips/SagemCom PicoPix 1020 + - Philips/SagemCom PicoPix 2055 + - Philips/SagemCom PicoPix 2330 + - Top-Height/TEC PP700 + . + This package contains the debugging symbols for libam7xxx. + +Package: libam7xxx-dev +Architecture: any +Depends: ${misc:Depends}, libam7xxx0.1 (= ${binary:Version}) +Recommends: libam7xxx0.1-doc (= ${source:Version}) +Description: library for accessing am7xxx based devices -- development files + libam7xxx is an Open Source library to communicate via USB with projectors and + Digital Picture Frames based on the Actions Micro AM7XXX family if ICs. + . + libam7xxx makes it possible to use these devices as USB displays on + non-Windows Operating Systems like GNU/Linux or Android/Linux just to name + a few, and on non-PC platforms like for instance mobile phones, tablets or + game consoles. + . + Examples of supported devices are: + - Acer C110 + - Acer C112 + - Aiptek PocketCinema T25 + - Philips/SagemCom PicoPix 1020 + - Philips/SagemCom PicoPix 2055 + - Philips/SagemCom PicoPix 2330 + - Top-Height/TEC PP700 + . + This is the development package containing the libraries and header for + software development with libam7xxx. + +Package: libam7xxx-bin +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: library for accessing am7xxx devices -- utilities and samples + libam7xxx is an Open Source library to communicate via USB with projectors and + Digital Picture Frames based on the Actions Micro AM7XXX family if ICs. + . + libam7xxx makes it possible to use these devices as USB displays on + non-Windows Operating Systems like GNU/Linux or Android/Linux just to name + a few, and on non-PC platforms like for instance mobile phones, tablets or + game consoles. + . + Examples of supported devices are: + - Acer C110 + - Acer C112 + - Aiptek PocketCinema T25 + - Philips/SagemCom PicoPix 1020 + - Philips/SagemCom PicoPix 2055 + - Philips/SagemCom PicoPix 2330 + - Top-Height/TEC PP700 + . + This package includes utilities and sample programs for libam7xxx. + +Package: libam7xxx-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: library for accessing am7xxx devices -- documentation + libam7xxx is an Open Source library to communicate via USB with projectors and + Digital Picture Frames based on the Actions Micro AM7XXX family if ICs. + . + libam7xxx makes it possible to use these devices as USB displays on + non-Windows Operating Systems like GNU/Linux or Android/Linux just to name + a few, and on non-PC platforms like for instance mobile phones, tablets or + game consoles. + . + Examples of supported devices are: + - Acer C110 + - Acer C112 + - Aiptek PocketCinema T25 + - Philips/SagemCom PicoPix 1020 + - Philips/SagemCom PicoPix 2055 + - Philips/SagemCom PicoPix 2330 + - Top-Height/TEC PP700 + . + This package contains the documentation of the API of libam7xxx. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..6b81095 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,88 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libam7xxx +Upstream-Contact: Antonio Ospite +Source: http://git.ao2.it/libam7xxx.git + +Files: * +Copyright: 2012, Antonio Ospite +License: GPL-2+ + +Files: cmake_modules/Findlibusb-1.0.cmake +Copyright: 2006, Andreas Schneider + 2008, Kyle Machulis +License: BSD-3+CMAKE + +Files: cmake_modules/FindXCB.cmake +Copyright: 2008 Helio Chissini de Castro, + 2007, Matthias Kretz, +License: BSD-3+CMAKE + +Files: debian/* +Copyright: 2012, Antonio Ospite +License: GPL-2+ + +Files: examples/* +Copyright: 2012, Antonio Ospite +License: GPL-3+ + +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: GPL-3+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + +License: BSD-3+CMAKE + Redistribution and use is allowed according to the terms of the New BSD license. + . + CMake-Modules Project New BSD License + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the CMake-Modules Project nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..17033f3 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,5 @@ +[DEFAULT] +debian-branch = debian +upstream-branch = master +upstream-tag = v%(version)s +prinstine-tar = False diff --git a/debian/libam7xxx-bin.install b/debian/libam7xxx-bin.install new file mode 100644 index 0000000..1df36c6 --- /dev/null +++ b/debian/libam7xxx-bin.install @@ -0,0 +1 @@ +usr/bin/* diff --git a/debian/libam7xxx-bin.manpages b/debian/libam7xxx-bin.manpages new file mode 100644 index 0000000..4450a71 --- /dev/null +++ b/debian/libam7xxx-bin.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/*.1 diff --git a/debian/libam7xxx-dev.install b/debian/libam7xxx-dev.install new file mode 100644 index 0000000..6970d78 --- /dev/null +++ b/debian/libam7xxx-dev.install @@ -0,0 +1,3 @@ +usr/include/am7xxx.h +usr/lib/*.so +usr/lib/pkgconfig/* diff --git a/debian/libam7xxx-doc.doc-base b/debian/libam7xxx-doc.doc-base new file mode 100644 index 0000000..cfa0385 --- /dev/null +++ b/debian/libam7xxx-doc.doc-base @@ -0,0 +1,10 @@ +Document: libam7xxx +Title: libam7xxx API Manual +Author: libam7xxx project +Abstract: This manual describes the API of libam7xxx, an open source driver + for AM7XXX devices. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libam7xxx-doc/html/index.html +Files: /usr/share/doc/libam7xxx-doc/html/*.html diff --git a/debian/libam7xxx-doc.docs b/debian/libam7xxx-doc.docs new file mode 100644 index 0000000..2423339 --- /dev/null +++ b/debian/libam7xxx-doc.docs @@ -0,0 +1,3 @@ +HACKING.asciidoc +README.asciidoc +debian/tmp/usr/share/doc/libam7xxx/html/ diff --git a/debian/libam7xxx-doc.examples b/debian/libam7xxx-doc.examples new file mode 100644 index 0000000..43ec862 --- /dev/null +++ b/debian/libam7xxx-doc.examples @@ -0,0 +1 @@ +examples/*.c diff --git a/debian/libam7xxx-doc.lintian-overrides b/debian/libam7xxx-doc.lintian-overrides new file mode 100644 index 0000000..d1a87d7 --- /dev/null +++ b/debian/libam7xxx-doc.lintian-overrides @@ -0,0 +1,4 @@ +# These are derived from how doxygen works, we are masking them so to have +# less noise when running lintian +libam7xxx-doc: duplicate-files usr/share/doc/libam7xxx-doc/html/search/all_6e.js usr/share/doc/libam7xxx-doc/html/search/variables_6e.js +libam7xxx-doc: embedded-javascript-library usr/share/doc/libam7xxx-doc/html/jquery.js diff --git a/debian/libam7xxx0.1.install b/debian/libam7xxx0.1.install new file mode 100644 index 0000000..093956b --- /dev/null +++ b/debian/libam7xxx0.1.install @@ -0,0 +1 @@ +usr/lib/*.so.* diff --git a/debian/libam7xxx0.1.symbols b/debian/libam7xxx0.1.symbols new file mode 100644 index 0000000..c46f82e --- /dev/null +++ b/debian/libam7xxx0.1.symbols @@ -0,0 +1,12 @@ +libam7xxx.so.0.1 libam7xxx0.1 #MINVER# + am7xxx_calc_scaled_image_dimensions@Base 0.1.0 + am7xxx_close_device@Base 0.1.0 + am7xxx_get_device_info@Base 0.1.0 + am7xxx_init@Base 0.1.0 + am7xxx_open_device@Base 0.1.0 + am7xxx_send_image@Base 0.1.0 + am7xxx_send_image_async@Base 0.1.4 + am7xxx_set_log_level@Base 0.1.0 + am7xxx_set_power_mode@Base 0.1.0 + am7xxx_set_zoom_mode@Base 0.1.3 + am7xxx_shutdown@Base 0.1.0 diff --git a/debian/libam7xxx0.1.udev b/debian/libam7xxx0.1.udev new file mode 120000 index 0000000..e5bed5d --- /dev/null +++ b/debian/libam7xxx0.1.udev @@ -0,0 +1 @@ +../contrib/55-am7xxx.rules \ No newline at end of file diff --git a/debian/patches/0001-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch b/debian/patches/0001-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch new file mode 100644 index 0000000..9310ec0 --- /dev/null +++ b/debian/patches/0001-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch @@ -0,0 +1,101 @@ +From 25fee52c64caa7230a3c2b03467114e0c84fee67 Mon Sep 17 00:00:00 2001 +From: Antonio Ospite +Date: Sun, 28 Jul 2013 19:35:41 +0200 +Subject: [PATCH] Revert "am7xxx-play: switch to avcodec_encode_video2()" +X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM/Vb;]yA5\I~93>J<_`<4)A{':UrE + +This reverts commit b344c71f3e03f912d8b6ee7d96cdd67b31cdf8cc. + +avcodec_encode_video2() has been introduced in lavc 54.01.0 but Debian Wheezy +ships with lavc 53, so for now we should revert this change for the Debian +packages. + +When this patch will be dropped maybe the package should depend on +libavcodec54 as the old API may be disabled in the Debian packages. +--- + examples/am7xxx-play.c | 29 +++++++++-------------------- + 1 file changed, 9 insertions(+), 20 deletions(-) + +diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c +index 3230e67..37d1191 100644 +--- a/examples/am7xxx-play.c ++++ b/examples/am7xxx-play.c +@@ -285,12 +285,9 @@ static int am7xxx_play(const char *input_format_string, + int out_buf_size; + uint8_t *out_buf; + int out_picture_size; +- uint8_t *out_picture; + struct SwsContext *sw_scale_ctx; + AVPacket in_packet; +- AVPacket out_packet; + int got_picture; +- int got_packet; + int ret; + + ret = video_input_init(&input_ctx, input_format_string, input_path, input_options); +@@ -393,26 +390,20 @@ static int am7xxx_play(const char *input_format_string, + picture_scaled->linesize); + + if (output_ctx.raw_output) { +- out_picture = out_buf; + out_picture_size = out_buf_size; + } else { + picture_scaled->quality = (output_ctx.codec_ctx)->global_quality; +- av_init_packet(&out_packet); +- out_packet.data = NULL; +- out_packet.size = 0; +- got_packet = 0; +- ret = avcodec_encode_video2(output_ctx.codec_ctx, +- &out_packet, +- picture_scaled, +- &got_packet); +- if (ret < 0 || !got_packet) { ++ /* TODO: switch to avcodec_encode_video2() eventually */ ++ out_picture_size = avcodec_encode_video(output_ctx.codec_ctx, ++ out_buf, ++ out_buf_size, ++ picture_scaled); ++ if (out_picture_size < 0) { + fprintf(stderr, "cannot encode video\n"); ++ ret = out_picture_size; + run = 0; + goto end_while; + } +- +- out_picture = out_packet.data; +- out_picture_size = out_packet.size; + } + + #ifdef DEBUG +@@ -423,7 +414,7 @@ static int am7xxx_play(const char *input_format_string, + else + snprintf(filename, NAME_MAX, "out.raw"); + file = fopen(filename, "wb"); +- fwrite(out_picture, 1, out_picture_size, file); ++ fwrite(out_buf, 1, out_picture_size, file); + fclose(file); + #endif + +@@ -431,7 +422,7 @@ static int am7xxx_play(const char *input_format_string, + image_format, + (output_ctx.codec_ctx)->width, + (output_ctx.codec_ctx)->height, +- out_picture, ++ out_buf, + out_picture_size); + if (ret < 0) { + perror("am7xxx_send_image"); +@@ -440,8 +431,6 @@ static int am7xxx_play(const char *input_format_string, + } + } + end_while: +- if (!output_ctx.raw_output && got_packet) +- av_free_packet(&out_packet); + av_free_packet(&in_packet); + } + +-- +1.8.3.2 + diff --git a/debian/patches/0002-am7xxx-add-quirks-for-Philips-Sagemcom-PicoPix-2055.patch b/debian/patches/0002-am7xxx-add-quirks-for-Philips-Sagemcom-PicoPix-2055.patch new file mode 100644 index 0000000..53cdaf4 --- /dev/null +++ b/debian/patches/0002-am7xxx-add-quirks-for-Philips-Sagemcom-PicoPix-2055.patch @@ -0,0 +1,34 @@ +From 03231a2b8d29e8cef1628cb25335f9583f067496 Mon Sep 17 00:00:00 2001 +From: Antonio Ospite +Date: Sat, 3 Aug 2013 15:14:34 +0200 +Subject: [PATCH] am7xxx: add quirks for Philips/Sagemcom PicoPix 2055 +X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM/Vb;]yA5\I~93>J<_`<4)A{':UrE + +The Philips/Sagemcom PicoPix 2055 does not support some operations: + - setting the power mode confuses the firmware + - setting the zoom mode has no effect whatsoever + +Disable these operations. + +Thanks-to: Luca Bompani +--- + src/am7xxx.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/am7xxx.c b/src/am7xxx.c +index 5b1e35a..b66a4ee 100644 +--- a/src/am7xxx.c ++++ b/src/am7xxx.c +@@ -111,6 +111,7 @@ static const struct am7xxx_usb_device_descriptor supported_devices[] = { + .product_id = 0x0016, + .configuration = 2, + .interface_number = 0, ++ .quirks = AM7XXX_QUIRK_NO_POWER_MODE | AM7XXX_QUIRK_NO_ZOOM_MODE, + }, + { + .name = "Philips/Sagemcom PicoPix 2330", +-- +1.8.4.rc1 + diff --git a/debian/patches/0003-CMakeLists.txt-define-DEBUG-1-only-when-CMAKE_BUILD_.patch b/debian/patches/0003-CMakeLists.txt-define-DEBUG-1-only-when-CMAKE_BUILD_.patch new file mode 100644 index 0000000..9ba2b6c --- /dev/null +++ b/debian/patches/0003-CMakeLists.txt-define-DEBUG-1-only-when-CMAKE_BUILD_.patch @@ -0,0 +1,46 @@ +From f3b176f27268e13942f452e915171b9c8b34f6ce Mon Sep 17 00:00:00 2001 +From: Antonio Ospite +Date: Wed, 30 Oct 2013 10:41:06 +0100 +Subject: [PATCH] CMakeLists.txt: define DEBUG=1 only when + CMAKE_BUILD_TYPE=Debug +X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM/Vb;]yA5\I~93>J<_`<4)A{':UrE + +When building with CMAKE_BUILD_TYPE=RelWithDebInfo the development debug +code should not be enabled, so don't define DEBUG=1 in DEBUG_FLAGS as +this will end up being both in CMAKE_C_FLAGS_DEBUG and +CMAKE_C_FLAGS_RELWITHDEBINFO. + +Instead define DEBUG=1 only for CMAKE_C_FLAGS_DEBUG so it gets used only +when CMAKE_BUILD_TYPE=Debug. +--- + CMakeLists.txt | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d643ed9..fa111c9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -69,8 +69,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) + -fstack-protector) + + add_flags(DEBUG_FLAGS +- -ggdb +- -DDEBUG=1) ++ -ggdb) + + add_flags(RELEASE_FLAGS + -Wp,-D_FORTIFY_SOURCE=2) +@@ -105,7 +104,7 @@ if (CMAKE_COMPILER_IS_CLANG) + endif() + endif() + +-set(CMAKE_C_FLAGS_DEBUG "-O0 ${DEBUG_FLAGS} ${STRICT_FLAGS}") ++set(CMAKE_C_FLAGS_DEBUG "-O0 -DDEBUG=1 ${DEBUG_FLAGS} ${STRICT_FLAGS}") + set(CMAKE_C_FLAGS_RELEASE "-O2 ${RELEASE_FLAGS} ${STRICT_FLAGS}") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 ${RELEASE_FLAGS} ${DEBUG_FLAGS} ${STRICT_FLAGS}") + +-- +1.8.4.rc3 + diff --git a/debian/patches/0004-Revert-am7xxx-use-the-symbolic-constant-for-libusb-l.patch b/debian/patches/0004-Revert-am7xxx-use-the-symbolic-constant-for-libusb-l.patch new file mode 100644 index 0000000..18c507f --- /dev/null +++ b/debian/patches/0004-Revert-am7xxx-use-the-symbolic-constant-for-libusb-l.patch @@ -0,0 +1,30 @@ +From d33f5f7c7ff7087188054de13d47d6b9ba525804 Mon Sep 17 00:00:00 2001 +From: Antonio Ospite +Date: Sun, 5 Jan 2014 08:30:03 +0100 +Subject: [PATCH] Revert "am7xxx: use the symbolic constant for libusb log + level" +X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM/Vb;]yA5\I~93>J<_`<4)A{':UrE + +This reverts commit 6d960cf72946c2f05d60dfcf8fb21efbdb69c9c7. +--- + src/am7xxx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/am7xxx.c b/src/am7xxx.c +index 4ac2461..5b25e96 100644 +--- a/src/am7xxx.c ++++ b/src/am7xxx.c +@@ -982,7 +982,7 @@ AM7XXX_PUBLIC int am7xxx_init(am7xxx_context **ctx) + if (ret < 0) + goto out_free_context; + +- libusb_set_debug((*ctx)->usb_context, LIBUSB_LOG_LEVEL_INFO); ++ libusb_set_debug((*ctx)->usb_context, 3); + + ret = scan_devices(*ctx, SCAN_OP_BUILD_DEVLIST , 0, NULL); + if (ret < 0) { +-- +1.8.5.2 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..277215d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +0001-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch +0002-am7xxx-add-quirks-for-Philips-Sagemcom-PicoPix-2055.patch +0003-CMakeLists.txt-define-DEBUG-1-only-when-CMAKE_BUILD_.patch +0004-Revert-am7xxx-use-the-symbolic-constant-for-libusb-l.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..5c88420 --- /dev/null +++ b/debian/rules @@ -0,0 +1,13 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +DEB_LDFLAGS_MAINT_APPEND=-Wl,-Bsymbolic-functions -Wl,--as-needed +include /usr/share/dpkg/buildflags.mk +export CFLAGS CPPFLAGS LDFLAGS + +%: + dh $@ + +.PHONY: override_dh_strip +override_dh_strip: + dh_strip --dbg-package=libam7xxx0.1-dbg diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..0f44399 --- /dev/null +++ b/debian/watch @@ -0,0 +1 @@ +#git=git://git.ao2.it/libam7xxx.git