[SCM] gmerlin-avdecoder/master: Refresh patches with shortening quilt options, and improve DEP3 headers.
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Mar 25 17:35:38 UTC 2012
The following commit has been merged in the master branch:
commit dca447d8238e853d4cb54a8ecafccd283f608d95
Author: Jonas Smedegaard <dr at jones.dk>
Date: Sun Mar 25 19:14:50 2012 +0200
Refresh patches with shortening quilt options, and improve DEP3 headers.
diff --git a/debian/patches/autoconf_removed_sources.patch b/debian/patches/autoconf_removed_sources.patch
index 5a928c3..89ddeee 100644
--- a/debian/patches/autoconf_removed_sources.patch
+++ b/debian/patches/autoconf_removed_sources.patch
@@ -1,8 +1,9 @@
Description: fix build-system due to removed upstream sources
-From: IOhannes m zmölnig
+Author: IOhannes m zmölnig <zmoelnig at iem.at>
+Last-Update: 2011-01-10
---- gmerlin-avdecoder.orig/configure.ac
-+++ gmerlin-avdecoder/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -570,13 +570,6 @@
include/Makefile \
include/bgav_version.h \
@@ -17,8 +18,8 @@ From: IOhannes m zmölnig
m4/Makefile \
plugins/Makefile \
tests/Makefile ])
---- gmerlin-avdecoder.orig/lib/Makefile.am
-+++ gmerlin-avdecoder/lib/Makefile.am
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
@@ -234,19 +234,9 @@
speex_sources =
endif
diff --git a/debian/patches/fix_dvdread_configure.patch b/debian/patches/fix_dvdread_configure.patch
index dc9ad48..ecd0e77 100644
--- a/debian/patches/fix_dvdread_configure.patch
+++ b/debian/patches/fix_dvdread_configure.patch
@@ -1,4 +1,7 @@
-Fix dvdread detection.
+Description: fix dvdread detection
+Author: Romain Beauxis <toots at rastageeks.org>
+Last-Update: 2010-08-13
+
--- a/m4/check_funcs.m4
+++ b/m4/check_funcs.m4
@@ -945,11 +945,7 @@
diff --git a/debian/patches/fix_typos.patch b/debian/patches/fix_typos.patch
index c267ccf..6670e44 100644
--- a/debian/patches/fix_typos.patch
+++ b/debian/patches/fix_typos.patch
@@ -1,7 +1,9 @@
Description: fix various typos that made lintian complain
-Author: IOhannes m zmölnig
---- gmerlin-avdecoder.orig/lib/demux_nsv.c
-+++ gmerlin-avdecoder/lib/demux_nsv.c
+Author: IOhannes m zmölnig <zmoelnig at iem.at>
+Last-Update: 2011-01-10
+
+--- a/lib/demux_nsv.c
++++ b/lib/demux_nsv.c
@@ -516,7 +516,7 @@
else
{
@@ -11,8 +13,8 @@ Author: IOhannes m zmölnig
}
}
---- gmerlin-avdecoder.orig/lib/in_rtsp.c
-+++ gmerlin-avdecoder/lib/in_rtsp.c
+--- a/lib/in_rtsp.c
++++ b/lib/in_rtsp.c
@@ -578,7 +578,7 @@
freeaddrinfo(addr);
@@ -22,8 +24,8 @@ Author: IOhannes m zmölnig
free(ip);
}
else
---- gmerlin-avdecoder.orig/lib/sdp.c
-+++ gmerlin-avdecoder/lib/sdp.c
+--- a/lib/sdp.c
++++ b/lib/sdp.c
@@ -813,7 +813,7 @@
void bgav_sdp_dump(bgav_sdp_t * s)
{
@@ -33,8 +35,8 @@ Author: IOhannes m zmölnig
bgav_dprintf( "Origin:\n");
---- gmerlin-avdecoder.orig/po/de.po
-+++ gmerlin-avdecoder/po/de.po
+--- a/po/de.po
++++ b/po/de.po
@@ -165,7 +165,7 @@
"Port base for RTP over UDP. Values of 1024 or smaller enable random ports "
"(recommended for RTSP aware firewalls). Values larger than 1024 define the "
@@ -62,8 +64,8 @@ Author: IOhannes m zmölnig
msgstr ""
#: lib/in_rtsp.c:593
---- gmerlin-avdecoder.orig/po/gmerlin-avdecoder.pot
-+++ gmerlin-avdecoder/po/gmerlin-avdecoder.pot
+--- a/po/gmerlin-avdecoder.pot
++++ b/po/gmerlin-avdecoder.pot
@@ -164,7 +164,7 @@
"Port base for RTP over UDP. Values of 1024 or smaller enable random ports "
"(recommended for RTSP aware firewalls). Values larger than 1024 define the "
@@ -91,8 +93,8 @@ Author: IOhannes m zmölnig
msgstr ""
#: lib/in_rtsp.c:593
---- gmerlin-avdecoder.orig/plugins/i_avdec.c
-+++ gmerlin-avdecoder/plugins/i_avdec.c
+--- a/plugins/i_avdec.c
++++ b/plugins/i_avdec.c
@@ -260,7 +260,7 @@
.val_min = { .val_i = 0 },
.val_max = { .val_i = 65530 },
@@ -102,4 +104,3 @@ Author: IOhannes m zmölnig
},
{
.name = "ftp_options",
-Binary files gmerlin-avdecoder.orig/.git/index and gmerlin-avdecoder/.git/index differ
diff --git a/debian/patches/libav_0.7.patch b/debian/patches/libav_0.7.patch
index 5f3e964..32526b2 100644
--- a/debian/patches/libav_0.7.patch
+++ b/debian/patches/libav_0.7.patch
@@ -1,15 +1,11 @@
-Description: Fix compilation with new libav 0.7.
+Description: fix compilation with new libav 0.7
Author: Colin Watson <cjwatson at ubuntu.com>
Bug-Ubuntu: https://launchpad.net/bugs/831276
Bug-Debian: http://bugs.debian.org/638564
-Forwarded: no
----
- lib/demux_ffmpeg.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++------
- lib/video_ffmpeg.c | 15 ++++++++--
- 2 files changed, 77 insertions(+), 11 deletions(-)
+Last-Update: 2011-08-30
---- gmerlin-avdecoder.orig/lib/demux_ffmpeg.c
-+++ gmerlin-avdecoder/lib/demux_ffmpeg.c
+--- a/lib/demux_ffmpeg.c
++++ b/lib/demux_ffmpeg.c
@@ -29,6 +29,29 @@
#define PROBE_SIZE 2048 /* Same as in MPlayer */
@@ -40,7 +36,7 @@ Forwarded: no
static void cleanup_stream_ffmpeg(bgav_stream_t * s)
{
if(s->type == BGAV_STREAM_VIDEO)
-@@ -45,7 +68,7 @@ typedef struct
+@@ -45,7 +68,7 @@
#if LIBAVFORMAT_VERSION_INT < ((52<<16)+(0<<8)+0)
ByteIOContext pb;
#else
@@ -49,7 +45,7 @@ Forwarded: no
#endif
} ffmpeg_priv_t;
-@@ -572,9 +595,16 @@ static int open_ffmpeg(bgav_demuxer_cont
+@@ -572,9 +595,16 @@
int i;
ffmpeg_priv_t * priv;
AVFormatContext *avfc;
@@ -66,7 +62,7 @@ Forwarded: no
priv = calloc(1, sizeof(*priv));
ctx->priv = priv;
-@@ -582,8 +612,10 @@ static int open_ffmpeg(bgav_demuxer_cont
+@@ -582,8 +612,10 @@
called multiple times */
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 29, 0)
register_protocol(&bgav_protocol);
@@ -78,7 +74,7 @@ Forwarded: no
#endif
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 26, 0)
-@@ -594,7 +626,7 @@ static int open_ffmpeg(bgav_demuxer_cont
+@@ -594,7 +626,7 @@
tmp_filename = bgav_sprintf("bgav:%s", ctx->input->filename);
@@ -87,7 +83,7 @@ Forwarded: no
#if LIBAVFORMAT_VERSION_INT < ((52<<16)+(0<<8)+0)
((URLContext*)(priv->pb.opaque))->priv_data= ctx->input;
#else
-@@ -604,8 +636,11 @@ static int open_ffmpeg(bgav_demuxer_cont
+@@ -604,8 +636,11 @@
#if LIBAVFORMAT_VERSION_INT < ((52<<16)+(0<<8)+0)
if(av_open_input_stream(&avfc, &priv->pb, tmp_filename, priv->avif, &ap)<0)
@@ -100,7 +96,7 @@ Forwarded: no
#endif
{
bgav_log(ctx->opt,BGAV_LOG_ERROR,LOG_DOMAIN,
-@@ -629,13 +664,13 @@ static int open_ffmpeg(bgav_demuxer_cont
+@@ -629,13 +664,13 @@
{
switch(avfc->streams[i]->codec->codec_type)
{
@@ -117,7 +113,7 @@ Forwarded: no
break;
default:
break;
-@@ -654,6 +689,7 @@ static int open_ffmpeg(bgav_demuxer_cont
+@@ -654,6 +689,7 @@
priv->avfc->iformat->long_name);
/* Metadata */
@@ -125,7 +121,7 @@ Forwarded: no
if(avfc->title[0])
ctx->tt->cur->metadata.title = bgav_strdup(avfc->title);
if(avfc->author[0])
-@@ -664,6 +700,27 @@ static int open_ffmpeg(bgav_demuxer_cont
+@@ -664,6 +700,27 @@
ctx->tt->cur->metadata.album = bgav_strdup(avfc->album);
if(avfc->genre[0])
ctx->tt->cur->metadata.genre = bgav_strdup(avfc->genre);
@@ -153,7 +149,7 @@ Forwarded: no
return 1;
}
-@@ -739,7 +796,7 @@ static int next_packet_ffmpeg(bgav_demux
+@@ -739,7 +796,7 @@
s->data.video.palette_changed = 1;
}
@@ -162,8 +158,8 @@ Forwarded: no
PACKET_SET_KEYFRAME(p);
bgav_stream_done_packet_write(s, p);
---- gmerlin-avdecoder.orig/lib/video_ffmpeg.c
-+++ gmerlin-avdecoder/lib/video_ffmpeg.c
+--- a/lib/video_ffmpeg.c
++++ b/lib/video_ffmpeg.c
@@ -64,6 +64,15 @@
#define HAS_DELAY (1<<0)
@@ -180,7 +176,7 @@ Forwarded: no
static int get_format_jpeg(bgav_stream_t*, bgav_packet_t * p);
static int get_format_dv(bgav_stream_t*, bgav_packet_t * p);
-@@ -116,8 +125,8 @@ typedef struct
+@@ -116,8 +125,8 @@
#ifdef HAVE_LIBPOSTPROC
int do_pp;
@@ -191,7 +187,7 @@ Forwarded: no
#endif
#ifdef HAVE_LIBSWSCALE
-@@ -836,7 +845,7 @@ static int init_ffmpeg(bgav_stream_t * s
+@@ -836,7 +845,7 @@
if(s->action == BGAV_STREAM_PARSE)
return 1;
diff --git a/debian/patches/system_gsm.patch b/debian/patches/system_gsm.patch
index 56108c6..08ce91e 100644
--- a/debian/patches/system_gsm.patch
+++ b/debian/patches/system_gsm.patch
@@ -1,9 +1,12 @@
-From: IOhannes m zmölnig
-Description: use system's libgsm (+headers), since the version that ships with
-upstream is removed (for policy reasons) and the two are supposed to be
-compatible
---- gmerlin-avdecoder.orig/configure.ac
-+++ gmerlin-avdecoder/configure.ac
+Description: use system libgsm
+ use system's libgsm (+headers), since the version that ships with
+ upstream is removed (for policy reasons) and the two are supposed to be
+ compatible
+Author: IOhannes m zmölnig <zmoelnig at iem.at>
+Last-Update: 2011-01-10
+
+--- a/configure.ac
++++ b/configure.ac
@@ -504,6 +504,18 @@
[disable libgsm]),
have_libgsm="false", have_libgsm="true")
@@ -23,8 +26,8 @@ compatible
if test "x$have_libgsm" = "xtrue"; then
AC_DEFINE([HAVE_LIBGSM])
fi
---- gmerlin-avdecoder.orig/lib/audio_gsm.c
-+++ gmerlin-avdecoder/lib/audio_gsm.c
+--- a/lib/audio_gsm.c
++++ b/lib/audio_gsm.c
@@ -23,7 +23,11 @@
#include <avdec_private.h>
#include <codecs.h>
@@ -38,8 +41,8 @@ compatible
/* Audio decoder for the internal libgsm */
---- gmerlin-avdecoder.orig/lib/Makefile.am
-+++ gmerlin-avdecoder/lib/Makefile.am
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
@@ -273,8 +273,8 @@
if HAVE_LIBGSM
--
gmerlin-avdecoder packaging
More information about the pkg-multimedia-commits
mailing list