From af06e1791ebac515ead762e785aea796ef356f1e Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Thu, 15 May 2014 13:03:44 +0200 Subject: [PATCH] debian/patches: drop all patches Some patches were fixes from upstream which are now in the orig codebase. Some other patches were reverts of upstream commits needed to build with older libav and libusb versions shipped in Debian distributions, drop these as well as they are not needed anymore to build the package in Unstable; possibly they can come back in a backport branch if needed. --- ...7xxx-play-switch-to-avcodec_encode_video2.patch | 101 --------------------- ...-quirks-for-Philips-Sagemcom-PicoPix-2055.patch | 34 ------- ...txt-define-DEBUG-1-only-when-CMAKE_BUILD_.patch | 46 ---------- ...xx-use-the-symbolic-constant-for-libusb-l.patch | 30 ------ debian/patches/series | 4 - 5 files changed, 215 deletions(-) delete mode 100644 debian/patches/0001-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch delete mode 100644 debian/patches/0002-am7xxx-add-quirks-for-Philips-Sagemcom-PicoPix-2055.patch delete mode 100644 debian/patches/0003-CMakeLists.txt-define-DEBUG-1-only-when-CMAKE_BUILD_.patch delete mode 100644 debian/patches/0004-Revert-am7xxx-use-the-symbolic-constant-for-libusb-l.patch delete mode 100644 debian/patches/series 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 deleted file mode 100644 index 9310ec0..0000000 --- a/debian/patches/0001-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch +++ /dev/null @@ -1,101 +0,0 @@ -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 deleted file mode 100644 index 53cdaf4..0000000 --- a/debian/patches/0002-am7xxx-add-quirks-for-Philips-Sagemcom-PicoPix-2055.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 9ba2b6c..0000000 --- a/debian/patches/0003-CMakeLists.txt-define-DEBUG-1-only-when-CMAKE_BUILD_.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 18c507f..0000000 --- a/debian/patches/0004-Revert-am7xxx-use-the-symbolic-constant-for-libusb-l.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 277215d..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,4 +0,0 @@ -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 -- 2.1.4