[SCM] nordlicht/master: Removed upstream applied patches
cinemast-guest at users.alioth.debian.org
cinemast-guest at users.alioth.debian.org
Fri Jan 13 22:45:51 UTC 2017
The following commit has been merged in the master branch:
commit 65e9f4c48ec56fde407e7089bbdd456545105bd1
Author: Peter Spiess-Knafl <dev at spiessknafl.at>
Date: Fri Jan 13 23:34:45 2017 +0100
Removed upstream applied patches
diff --git a/debian/patches/0001-fix-arm.patch b/debian/patches/0001-fix-arm.patch
deleted file mode 100644
index 87110a2..0000000
--- a/debian/patches/0001-fix-arm.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2e33a667a3b913c9975cb83d1656a6f4b7e74934 Mon Sep 17 00:00:00 2001
-From: Sebastian Morr <sebastian at morr.cc>
-Date: Mon, 1 Feb 2016 19:10:27 +0100
-Subject: poptGetNextOpt returns int, not char. Fixes building on ARM.
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813101
-
----
- main.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/main.c
-+++ b/main.c
-@@ -106,13 +106,13 @@
- const poptContext popt = poptGetContext(NULL, argc, argv, optionsTable, 0);
- poptSetOtherOptionHelp(popt, "[OPTION]... VIDEOFILE\n\nOptions:");
-
-- char c;
-+ int option;
-
-- // The next line leaks 3 bytes, blame popt!
-- while ((c = poptGetNextOpt(popt)) >= 0) { }
-+ // The next line leaks 2 bytes, blame popt!
-+ while ((option = poptGetNextOpt(popt)) >= 0) { }
-
-- if (c < -1) {
-- fprintf(stderr, "nordlicht: %s: %s\n", poptBadOption(popt, POPT_BADOPTION_NOALIAS), poptStrerror(c));
-+ if (option < -1) {
-+ fprintf(stderr, "nordlicht: %s: %s\n", poptBadOption(popt, POPT_BADOPTION_NOALIAS), poptStrerror(option));
- return 1;
- }
-
diff --git a/debian/patches/0002-fix-truncate-call.patch b/debian/patches/0002-fix-truncate-call.patch
deleted file mode 100644
index 02c0b4c..0000000
--- a/debian/patches/0002-fix-truncate-call.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3f77aff91f0c4e4bf2b131b7f8851e389c8cc68b Mon Sep 17 00:00:00 2001
-From: Sebastian Morr <sebastian at morr.cc>
-Date: Mon, 1 Feb 2016 19:20:28 +0100
-Subject: Don't ignore return value of ftruncate
-
----
- main.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/main.c
-+++ b/main.c
-@@ -225,7 +225,10 @@
- print_error("Could not open '%s'.", output_file);
- exit(1);
- }
-- ftruncate(fd, nordlicht_buffer_size(n));
-+ if (ftruncate(fd, nordlicht_buffer_size(n)) == -1) {
-+ print_error("Could not truncate '%s'.", output_file);
-+ exit(1);
-+ }
- data = (unsigned char *) mmap(NULL, nordlicht_buffer_size(n), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
- if (data == (void *) -1) {
- print_error("Could not mmap %d bytes.", nordlicht_buffer_size(n));
diff --git a/debian/patches/0003-ffmpeg3.patch b/debian/patches/0003-ffmpeg3.patch
deleted file mode 100644
index 23ed46d..0000000
--- a/debian/patches/0003-ffmpeg3.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-Description: ffmpeg 3.0 support
-Author: Peter Spiess-Knafl <dev at spiessknafl.at>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=821417
-Forwarded: https://github.com/nordlicht/nordlicht/issues/60
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/image.c
-+++ b/image.c
-@@ -9,7 +9,7 @@
- #define av_frame_alloc avcodec_alloc_frame
- #define av_frame_free av_freep
- void av_frame_get_buffer(AVFrame *frame, int magic) { avpicture_alloc((AVPicture *)frame, frame->format, frame->width, frame->height); }
--void av_frame_copy(AVFrame *dst, AVFrame *src) { memcpy(dst->data[0], src->data[0], sizeof(uint8_t)*avpicture_get_size(PIX_FMT_RGB24, dst->width, dst->height)); }
-+void av_frame_copy(AVFrame *dst, AVFrame *src) { memcpy(dst->data[0], src->data[0], sizeof(uint8_t)*avpicture_get_size(AV_PIX_FMT_RGB24, dst->width, dst->height)); }
- #endif
-
- #define MAX_FILTER_SIZE 256
-@@ -25,7 +25,7 @@
- i->frame = (AVFrame *) av_frame_alloc();
- i->frame->width = width;
- i->frame->height = height;
-- i->frame->format = PIX_FMT_RGB24; // best choice?
-+ i->frame->format = AV_PIX_FMT_RGB24; // best choice?
- av_frame_get_buffer(i->frame, 16); // magic number?
- return i;
- }
-@@ -240,7 +240,7 @@
- encoder_context = avcodec_alloc_context3(encoder);
- encoder_context->width = i->frame->width;
- encoder_context->height = i->frame->height;
-- encoder_context->pix_fmt = PIX_FMT_RGB24;
-+ encoder_context->pix_fmt = AV_PIX_FMT_RGB24;
- if (avcodec_open2(encoder_context, encoder, NULL) < 0) {
- error("Could not open output codec.");
- return -1;
-@@ -273,7 +273,7 @@
- fwrite(packet.data, 1, packet.size, file);
- fclose(file);
-
-- av_free_packet(&packet);
-+ av_packet_unref(&packet);
-
- avcodec_close(encoder_context);
- av_free(encoder_context);
---- a/source.c
-+++ b/source.c
-@@ -4,6 +4,7 @@
- #include <libavcodec/avfft.h>
- #include <libavformat/avformat.h>
- #include <libavutil/avutil.h>
-+#include <libavutil/imgutils.h>
- #include <libswscale/swscale.h>
-
- #if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(52, 8, 0)
-@@ -85,15 +86,15 @@
- valid = 1;
- }
- }
-- av_free_packet(&s->packet);
-+ av_packet_unref(&s->packet);
- } else {
-- av_free_packet(&s->packet);
-+ av_packet_unref(&s->packet);
- st->current_frame = -1;
- return 1;
- }
- }
-
-- av_free_packet(&s->packet);
-+ av_packet_unref(&s->packet);
- st->current_frame = pts;
- return 0;
- }
-@@ -143,15 +144,15 @@
- // frames is HEURISTIC_KEYFRAME_FACTOR times higher than
- // the density we need overall.
- s->exact = 0;
-- av_free_packet(&s->packet);
-+ av_packet_unref(&s->packet);
- return;
- }
- }
- frame++;
- }
-- av_free_packet(&s->packet);
-+ av_packet_unref(&s->packet);
- }
-- av_free_packet(&s->packet);
-+ av_packet_unref(&s->packet);
- s->has_index = 1;
- }
-
-@@ -244,13 +245,13 @@
- s->scaleframe = av_frame_alloc();
- s->scaleframe->width = s->video->frame->width;
- s->scaleframe->height = s->video->frame->height;
-- s->scaleframe->format = PIX_FMT_RGB24;
-+ s->scaleframe->format = AV_PIX_FMT_RGB24;
-
-- s->buffer = (uint8_t *)av_malloc(sizeof(uint8_t)*avpicture_get_size(PIX_FMT_RGB24, s->scaleframe->width, s->scaleframe->height));
-- avpicture_fill((AVPicture *)s->scaleframe, s->buffer, PIX_FMT_RGB24, s->video->frame->width, s->video->frame->height);
-+ s->buffer = (uint8_t *)av_malloc(sizeof(uint8_t)*av_image_get_buffer_size(AV_PIX_FMT_RGB24, s->scaleframe->width, s->scaleframe->height,1));
-+ av_image_fill_arrays(s->scaleframe->data, s->scaleframe->linesize, s->buffer, AV_PIX_FMT_RGB24, s->video->frame->width, s->video->frame->height, 1);
-
- s->sws_context = sws_getCachedContext(NULL, s->video->frame->width, s->video->frame->height, s->video->frame->format,
-- s->scaleframe->width, s->scaleframe->height, PIX_FMT_RGB24, SWS_AREA, NULL, NULL, NULL);
-+ s->scaleframe->width, s->scaleframe->height, AV_PIX_FMT_RGB24, SWS_AREA, NULL, NULL, NULL);
- }
-
- s->keyframes = NULL;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c74c76c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0003-ffmpeg3.patch
-0001-fix-arm.patch
-0002-fix-truncate-call.patch
--
nordlicht packaging
More information about the pkg-multimedia-commits
mailing list