rpms/mlt/F-11 .cvsignore,1.6,1.7 mlt.spec,1.5,1.6 sources,1.6,1.7
by Zarko Pintar
Author: grof
Update of /cvs/free/rpms/mlt/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17621/F-11
Modified Files:
.cvsignore mlt.spec sources
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mlt/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 11 Dec 2009 07:21:29 -0000 1.6
+++ .cvsignore 19 Feb 2010 11:41:39 -0000 1.7
@@ -1 +1 @@
-mlt-0.4.10.tar.gz
+mlt-0.5.0.tar.gz
Index: mlt.spec
===================================================================
RCS file: /cvs/free/rpms/mlt/F-11/mlt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mlt.spec 11 Dec 2009 07:21:29 -0000 1.5
+++ mlt.spec 19 Feb 2010 11:41:39 -0000 1.6
@@ -8,7 +8,7 @@
Summary: Toolkit for broadcasters, video editors, media players, transcoders
Name: mlt
-Version: 0.4.10
+Version: 0.5.0
Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
@@ -176,6 +176,9 @@
%changelog
+* Thu Feb 18 2010 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.5.0-1
+- new version
+
* Wed Dec 09 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.4.10-1
- new version
- added subpackage for ruby
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mlt/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 11 Dec 2009 07:21:29 -0000 1.6
+++ sources 19 Feb 2010 11:41:39 -0000 1.7
@@ -1 +1 @@
-7b0ba842277ea0a77e40a15917ab623f mlt-0.4.10.tar.gz
+5e904e02c879d64f1c6fe14c75be0479 mlt-0.5.0.tar.gz
14 years, 9 months
rpms/mlt/F-12 .cvsignore,1.5,1.6 mlt.spec,1.5,1.6 sources,1.5,1.6
by Zarko Pintar
Author: grof
Update of /cvs/free/rpms/mlt/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17459/F-12
Modified Files:
.cvsignore mlt.spec sources
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mlt/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 11 Dec 2009 07:20:58 -0000 1.5
+++ .cvsignore 19 Feb 2010 11:41:04 -0000 1.6
@@ -1 +1 @@
-mlt-0.4.10.tar.gz
+mlt-0.5.0.tar.gz
Index: mlt.spec
===================================================================
RCS file: /cvs/free/rpms/mlt/F-12/mlt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mlt.spec 11 Dec 2009 07:20:58 -0000 1.5
+++ mlt.spec 19 Feb 2010 11:41:04 -0000 1.6
@@ -8,7 +8,7 @@
Summary: Toolkit for broadcasters, video editors, media players, transcoders
Name: mlt
-Version: 0.4.10
+Version: 0.5.0
Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
@@ -176,6 +176,9 @@
%changelog
+* Thu Feb 18 2010 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.5.0-1
+- new version
+
* Wed Dec 09 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.4.10-1
- new version
- added subpackage for ruby
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mlt/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 11 Dec 2009 07:20:58 -0000 1.5
+++ sources 19 Feb 2010 11:41:04 -0000 1.6
@@ -1 +1 @@
-7b0ba842277ea0a77e40a15917ab623f mlt-0.4.10.tar.gz
+5e904e02c879d64f1c6fe14c75be0479 mlt-0.5.0.tar.gz
14 years, 9 months
rpms/mlt/devel .cvsignore,1.5,1.6 mlt.spec,1.5,1.6 sources,1.5,1.6
by Zarko Pintar
Author: grof
Update of /cvs/free/rpms/mlt/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17042/devel
Modified Files:
.cvsignore mlt.spec sources
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mlt/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 11 Dec 2009 07:19:15 -0000 1.5
+++ .cvsignore 19 Feb 2010 11:40:25 -0000 1.6
@@ -1 +1 @@
-mlt-0.4.10.tar.gz
+mlt-0.5.0.tar.gz
Index: mlt.spec
===================================================================
RCS file: /cvs/free/rpms/mlt/devel/mlt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mlt.spec 11 Dec 2009 07:19:15 -0000 1.5
+++ mlt.spec 19 Feb 2010 11:40:25 -0000 1.6
@@ -8,7 +8,7 @@
Summary: Toolkit for broadcasters, video editors, media players, transcoders
Name: mlt
-Version: 0.4.10
+Version: 0.5.0
Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
@@ -176,6 +176,9 @@
%changelog
+* Thu Feb 18 2010 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.5.0-1
+- new version
+
* Wed Dec 09 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.4.10-1
- new version
- added subpackage for ruby
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mlt/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 11 Dec 2009 07:19:15 -0000 1.5
+++ sources 19 Feb 2010 11:40:25 -0000 1.6
@@ -1 +1 @@
-7b0ba842277ea0a77e40a15917ab623f mlt-0.4.10.tar.gz
+5e904e02c879d64f1c6fe14c75be0479 mlt-0.5.0.tar.gz
14 years, 9 months
rpms/libmms/F-12 libmms-0.5-patches.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libmms.spec, 1.4, 1.5 sources, 1.2, 1.3
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/libmms/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20609
Modified Files:
.cvsignore libmms.spec sources
Added Files:
libmms-0.5-patches.patch
Log Message:
* Thu Feb 18 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5-1
- New upstream release 0.5 (rf1053)
- Fix some regressions introduced by upstream
- Add a bunch of home grown patches (I used to be part of upstream, but
upstream has moved to launchpad), fixing several bugs and cleaning up
the code left and right, all these are submitted upstream
libmms-0.5-patches.patch:
b/src/asfheader.h | 6
b/src/mms.c | 14
b/src/mmsh.c | 159 +++++++--
b/src/uri.c | 7
b/src/uri.h | 3
src/mms.c | 898 ++++++++++++++++++++++++------------------------------
src/mmsh.c | 435 ++++++++++----------------
7 files changed, 717 insertions(+), 805 deletions(-)
--- NEW FILE libmms-0.5-patches.patch ---
>From 47c51e11e1969a5143eb953489921d4d632ff852 Mon Sep 17 00:00:00 2001
From: Hans de Goede <j.w.r.degoede(a)hhs.nl>
Date: Fri, 5 Feb 2010 17:27:38 +0100
Subject: [PATCH 01/22] Add upstream patch checking for bitpos pointing outside the header
Note the check is wron <= should be <, will fix this in a separate
patch (to send back upstream).
---
src/mms.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/mms.c b/src/mms.c
index 0884f6a..bb37077 100644
--- a/src/mms.c
+++ b/src/mms.c
@@ -1021,10 +1021,15 @@ int static mms_choose_best_streams(mms_io_t *io, mms_t *this) {
/* forces the asf demuxer to not choose this stream */
if (this->streams[i].bitrate_pos) {
- this->asf_header[this->streams[i].bitrate_pos ] = 0;
- this->asf_header[this->streams[i].bitrate_pos + 1] = 0;
- this->asf_header[this->streams[i].bitrate_pos + 2] = 0;
- this->asf_header[this->streams[i].bitrate_pos + 3] = 0;
+ if (this->streams[i].bitrate_pos+3 <= ASF_HEADER_LEN) {
+ this->asf_header[this->streams[i].bitrate_pos ] = 0;
+ this->asf_header[this->streams[i].bitrate_pos + 1] = 0;
+ this->asf_header[this->streams[i].bitrate_pos + 2] = 0;
+ this->asf_header[this->streams[i].bitrate_pos + 3] = 0;
+ } else {
+ lprintf("***LOG:*** -- "
+ "libmms: attempt to write beyond asf header limit");
+ }
}
}
}
--
1.7.0
>From e714a1410c260cb551a6c17dd4b8137644b9dc12 Mon Sep 17 00:00:00 2001
From: Hans de Goede <j.w.r.degoede(a)hhs.nl>
Date: Fri, 5 Feb 2010 17:39:54 +0100
Subject: [PATCH 02/22] Add support for GUID_ASF_EXTENDED_STREAM_PROPERTIES to mssh support
Patch from upstream bazar.
---
src/asfheader.h | 6 ++-
src/mmsh.c | 158 +++++++++++++++++++++++++++++++++++++++++--------------
2 files changed, 123 insertions(+), 41 deletions(-)
diff --git a/src/asfheader.h b/src/asfheader.h
index 09d94ed..2aaffb3 100644
--- a/src/asfheader.h
+++ b/src/asfheader.h
@@ -93,8 +93,9 @@
#define GUID_ASF_AUDIO_CONCEAL_NONE 34
#define GUID_ASF_CODEC_COMMENT1_HEADER 35
#define GUID_ASF_2_0_HEADER 36
+#define GUID_ASF_EXTENDED_STREAM_PROPERTIES 37
-#define GUID_END 37
+#define GUID_END 38
/* asf stream types */
@@ -256,6 +257,9 @@ static const struct
{ "asf 2.0 header",
{ 0xd6e229d1, 0x35da, 0x11d1, { 0x90, 0x34, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xbe }} },
+ { "extended stream properties",
+ { 0x14e6a5cb, 0xc672, 0x4332, { 0x83, 0x99, 0xa9, 0x69, 0x52, 0x06, 0x5b, 0x5a }} },
+
};
#endif
diff --git a/src/mmsh.c b/src/mmsh.c
index cd5ef9b..bc9da5a 100644
--- a/src/mmsh.c
+++ b/src/mmsh.c
@@ -605,6 +605,47 @@ static int get_header (mms_io_t *io, mmsh_t *this) {
}
}
+static void interp_stream_properties(mmsh_t *this, int i) {
+ uint16_t flags;
+ uint16_t stream_id;
+ int type;
+ int encrypted;
+ int guid;
+
+ guid = get_guid(this->asf_header, i);
+ switch (guid) {
+ case GUID_ASF_AUDIO_MEDIA:
+ type = ASF_STREAM_TYPE_AUDIO;
+ this->has_audio = 1;
+ break;
+
+ case GUID_ASF_VIDEO_MEDIA:
+ case GUID_ASF_JFIF_MEDIA:
+ case GUID_ASF_DEGRADABLE_JPEG_MEDIA:
+ type = ASF_STREAM_TYPE_VIDEO;
+ this->has_video = 1;
+ break;
+
+ case GUID_ASF_COMMAND_MEDIA:
+ type = ASF_STREAM_TYPE_CONTROL;
+ break;
+
+ default:
+ type = ASF_STREAM_TYPE_UNKNOWN;
+ }
+
+ flags = LE_16(this->asf_header + i + 48);
+ stream_id = flags & 0x7F;
+ encrypted = flags >> 15;
+
+ lprintf ("stream object, stream id: %d, type: %d, encrypted: %d\n",
+ stream_id, type, encrypted);
+
+ this->stream_types[stream_id] = type;
+ this->stream_ids[this->num_stream_ids] = stream_id;
+ this->num_stream_ids++;
+}
+
static void interp_header (mms_io_t *io, mmsh_t *this) {
int i;
@@ -651,46 +692,7 @@ static void interp_header (mms_io_t *io, mmsh_t *this) {
break;
case GUID_ASF_STREAM_PROPERTIES:
- {
- uint16_t flags;
- uint16_t stream_id;
- int type;
- int encrypted;
-
- guid = get_guid(this->asf_header, i);
- switch (guid) {
- case GUID_ASF_AUDIO_MEDIA:
- type = ASF_STREAM_TYPE_AUDIO;
- this->has_audio = 1;
- break;
-
- case GUID_ASF_VIDEO_MEDIA:
- case GUID_ASF_JFIF_MEDIA:
- case GUID_ASF_DEGRADABLE_JPEG_MEDIA:
- type = ASF_STREAM_TYPE_VIDEO;
- this->has_video = 1;
- break;
-
- case GUID_ASF_COMMAND_MEDIA:
- type = ASF_STREAM_TYPE_CONTROL;
- break;
-
- default:
- type = ASF_STREAM_TYPE_UNKNOWN;
- }
-
- flags = LE_16(this->asf_header + i + 48);
- stream_id = flags & 0x7F;
- encrypted = flags >> 15;
-
- lprintf ("stream object, stream id: %d, type: %d, encrypted: %d\n",
- stream_id, type, encrypted);
-
- this->stream_types[stream_id] = type;
- this->stream_ids[this->num_stream_ids] = stream_id;
- this->num_stream_ids++;
-
- }
+ interp_stream_properties(this, i);
break;
case GUID_ASF_STREAM_BITRATE_PROPERTIES:
@@ -714,6 +716,82 @@ static void interp_header (mms_io_t *io, mmsh_t *this) {
}
break;
+ case GUID_ASF_HEADER_EXTENSION:
+ {
+ int size = LE_32(this->asf_header + i + 18);
+ int j = 22;
+ int l;
+ lprintf("Extension header data size: %d\n", size);
+
+ while( (j+24) < length ) {
+ guid = get_guid(this->asf_header, i + j);
+ j += 16;
+
+ l = LE_64(this->asf_header + i + j);
+ j += 8;
+
+ switch(guid) {
+ case GUID_ASF_EXTENDED_STREAM_PROPERTIES:
+ {
+ int stream_no = LE_16(this->asf_header + i + j + 48);
+ int name_count = LE_16(this->asf_header + i + j + 60);
+ int ext_count = LE_16(this->asf_header + i + j + 62);
+ int ext_j = 64;
[...3403 lines suppressed...]
-
-
/*
* returns 1 on error
*/
static int mms_tcp_connect(mms_io_t *io, mms_t *this) {
- int progress, res;
-
if (!this->port) this->port = MMST_PORT;
/*
@@ -887,17 +864,6 @@ static int mms_tcp_connect(mms_io_t *io, mms_t *this) {
return 1;
}
- /* connection timeout 15s */
- progress = 0;
- do {
- /*FIXME: de-xine-ification */
-/* report_progress(this->stream, progress); */
- res = io_select(io, this->s, MMS_IO_WRITE_READY, 500);
- progress += 1;
- } while ((res == MMS_IO_STATUS_TIMEOUT) && (progress < 30));
- if (res != MMS_IO_STATUS_READY) {
- return 1;
- }
lprintf("mms: connected\n");
return 0;
}
@@ -1065,7 +1031,6 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
/* FIXME: needs proper error-signalling work */
this = (mms_t*) malloc (sizeof (mms_t));
- this->custom_data = data;
this->url = strdup (url);
this->s = -1;
this->seq_num = 0;
@@ -1085,9 +1050,6 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
this->current_pos = 0;
this->eos = 0;
- /* FIXME de-xine-ification */
-/* report_progress (stream, 0); */
-
this->guri = gnet_uri_new(this->url);
if(!this->guri) {
lprintf("mms: invalid url\n");
@@ -1115,8 +1077,6 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
if (mms_tcp_connect(io, this)) {
goto fail;
}
- /* FIXME de-xine-ification */
-/* report_progress (stream, 30); */
url_conv = iconv_open("UTF-16LE", "UTF-8");
if (url_conv == (iconv_t)-1) {
@@ -1157,9 +1117,6 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
goto fail;
}
- /* FIXME de-xine-ification */
-/* report_progress (stream, 40); */
-
/* TODO: insert network timing request here */
/* command 0x2 */
lprintf("mms: send command 0x02\n");
@@ -1197,9 +1154,6 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
goto fail;
}
- /* FIXME de-xine-ification */
-/* report_progress (stream, 50); */
-
/* command 0x5 */
{
mms_buffer_t command_buffer;
@@ -1252,9 +1206,6 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
goto fail;
}
- /* FIXME de-xine-ification */
-/* report_progress (stream, 60); */
-
/* command 0x15 */
lprintf("mms: send command 0x15\n");
{
@@ -1297,17 +1248,11 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
if (!this->asf_packet_len || !this->num_stream_ids)
goto fail;
- /* FIXME de-xine-ification */
-/* report_progress (stream, 70); */
-
if (!mms_choose_best_streams(io, this)) {
lprintf("mms: mms_choose_best_streams failed\n");
goto fail;
}
- /* FIXME de-xine-ification */
-/* report_progress (stream, 80); */
-
/* command 0x07 */
this->packet_id_type = ASF_MEDIA_PACKET_ID_TYPE;
{
@@ -1328,8 +1273,6 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
}
}
-/* report_progress (stream, 100); */
-
iconv_close(url_conv);
lprintf("mms: connect: passed\n");
diff --git a/src/mmsh.c b/src/mmsh.c
index cd396c9..dd6e39d 100644
--- a/src/mmsh.c
+++ b/src/mmsh.c
@@ -151,9 +151,6 @@ static const char* mmsh_RangeRequest =
struct mmsh_s {
- /* FIXME: de-xine-ification */
- void *custom_data;
-
int s;
/* url parsing */
@@ -810,8 +807,6 @@ static int mmsh_valid_proto (char *proto) {
* returns 1 on error
*/
static int mmsh_tcp_connect(mms_io_t *io, mmsh_t *this) {
- int progress, res;
-
if (!this->connect_port) this->connect_port = MMSH_PORT;
/*
@@ -826,18 +821,6 @@ static int mmsh_tcp_connect(mms_io_t *io, mmsh_t *this) {
return 1;
}
- /* connection timeout 15s */
- progress = 0;
- do {
-// report_progress(this->stream, progress);
- res = io_select (io, this->s, MMS_IO_WRITE_READY, 500);
- progress += 1;
- } while ((res == MMS_IO_STATUS_TIMEOUT) && (progress < 30));
- if (res != MMS_IO_STATUS_READY) {
- close (this->s);
- this->s = -1;
- return 1;
- }
lprintf("mmsh: connected\n");
return 0;
@@ -862,7 +845,6 @@ static int mmsh_connect_int (mms_io_t *io, mmsh_t *this, off_t seek, uint32_t ti
if (mmsh_tcp_connect(io, this)) {
return 0;
}
-// report_progress (stream, 30);
/*
* let the negotiations begin...
@@ -890,8 +872,6 @@ static int mmsh_connect_int (mms_io_t *io, mmsh_t *this, off_t seek, uint32_t ti
goto fail;
close(this->s);
-// report_progress (stream, 20);
-
/* choose the best quality for the audio stream */
/* i've never seen more than one audio stream */
@@ -1041,7 +1021,6 @@ mmsh_t *mmsh_connect (mms_io_t *io, void *data, const char *url, int bandwidth)
if (!url)
return NULL;
-// report_progress (stream, 0);
/*
* initializatoin is essential here. the fail: label depends
* on the various char * in our this structure to be
@@ -1059,7 +1038,6 @@ mmsh_t *mmsh_connect (mms_io_t *io, void *data, const char *url, int bandwidth)
this->host_password = NULL;
this->uri = NULL;
- this->custom_data = data;
this->url = strdup(url);
if ((proxy_env = getenv("http_proxy")) != NULL)
this->proxy_url = strdup(proxy_env);
@@ -1078,8 +1056,6 @@ mmsh_t *mmsh_connect (mms_io_t *io, void *data, const char *url, int bandwidth)
this->user_bandwidth = bandwidth;
this->http_request_number = 1;
-// report_progress (stream, 0);
-
if (this->proxy_url) {
proxy_uri = gnet_uri_new(this->proxy_url);
if (!proxy_uri) {
--
1.7.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libmms/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 May 2008 13:22:17 -0000 1.2
+++ .cvsignore 18 Feb 2010 18:23:27 -0000 1.3
@@ -1 +1 @@
-libmms-0.4.tar.gz
+libmms-0.5.tar.gz
Index: libmms.spec
===================================================================
RCS file: /cvs/free/rpms/libmms/F-12/libmms.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libmms.spec 29 Mar 2009 13:27:16 -0000 1.4
+++ libmms.spec 18 Feb 2010 18:23:27 -0000 1.5
@@ -1,11 +1,14 @@
Name: libmms
-Version: 0.4
-Release: 4%{?dist}
+Version: 0.5
+Release: 1%{?dist}
Summary: Library for Microsoft Media Server (MMS) streaming protocol
License: LGPLv2+
Group: System Environment/Libraries
-URL: http://libmms.sourceforge.net/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+URL: http://launchpad.net/libmms
+Source0: http://launchpad.net/libmms/trunk/0.5/+download/libmms-%{version}.tar.gz
+# Various patches from / heading into upstream bazar concatenated into 1
+# see the git headers inside the file for details
+Patch0: libmms-0.5-patches.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel
@@ -28,9 +31,11 @@
%prep
%setup -q
+%patch0 -p1
%build
+export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign"
%configure --disable-dependency-tracking --disable-static
make %{?_smp_mflags}
@@ -61,6 +66,13 @@
%changelog
+* Thu Feb 18 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5-1
+- New upstream release 0.5 (rf1053)
+- Fix some regressions introduced by upstream
+- Add a bunch of home grown patches (I used to be part of upstream, but
+ upstream has moved to launchpad), fixing several bugs and cleaning up
+ the code left and right, all these are submitted upstream
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.4-4
- rebuild for new F11 features
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libmms/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 May 2008 13:22:17 -0000 1.2
+++ sources 18 Feb 2010 18:23:27 -0000 1.3
@@ -1 +1 @@
-4a681a815186fe26bb1b02ccea57fb75 libmms-0.4.tar.gz
+cf83053ec891f14e73a04c84d9de08ee libmms-0.5.tar.gz
14 years, 9 months
rpms/libmms/devel libmms-0.5-patches.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libmms.spec, 1.4, 1.5 sources, 1.2, 1.3
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/libmms/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19680
Modified Files:
.cvsignore libmms.spec sources
Added Files:
libmms-0.5-patches.patch
Log Message:
* Thu Feb 18 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5-1
- New upstream release 0.5 (rf1053)
- Fix some regressions introduced by upstream
- Add a bunch of home grown patches (I used to be part of upstream, but
upstream has moved to launchpad), fixing several bugs and cleaning up
the code left and right, all these are submitted upstream
libmms-0.5-patches.patch:
b/src/asfheader.h | 6
b/src/mms.c | 14
b/src/mmsh.c | 159 +++++++--
b/src/uri.c | 7
b/src/uri.h | 3
src/mms.c | 898 ++++++++++++++++++++++++------------------------------
src/mmsh.c | 435 ++++++++++----------------
7 files changed, 717 insertions(+), 805 deletions(-)
--- NEW FILE libmms-0.5-patches.patch ---
>From 47c51e11e1969a5143eb953489921d4d632ff852 Mon Sep 17 00:00:00 2001
From: Hans de Goede <j.w.r.degoede(a)hhs.nl>
Date: Fri, 5 Feb 2010 17:27:38 +0100
Subject: [PATCH 01/22] Add upstream patch checking for bitpos pointing outside the header
Note the check is wron <= should be <, will fix this in a separate
patch (to send back upstream).
---
src/mms.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/mms.c b/src/mms.c
index 0884f6a..bb37077 100644
--- a/src/mms.c
+++ b/src/mms.c
@@ -1021,10 +1021,15 @@ int static mms_choose_best_streams(mms_io_t *io, mms_t *this) {
/* forces the asf demuxer to not choose this stream */
if (this->streams[i].bitrate_pos) {
- this->asf_header[this->streams[i].bitrate_pos ] = 0;
- this->asf_header[this->streams[i].bitrate_pos + 1] = 0;
- this->asf_header[this->streams[i].bitrate_pos + 2] = 0;
- this->asf_header[this->streams[i].bitrate_pos + 3] = 0;
+ if (this->streams[i].bitrate_pos+3 <= ASF_HEADER_LEN) {
+ this->asf_header[this->streams[i].bitrate_pos ] = 0;
+ this->asf_header[this->streams[i].bitrate_pos + 1] = 0;
+ this->asf_header[this->streams[i].bitrate_pos + 2] = 0;
+ this->asf_header[this->streams[i].bitrate_pos + 3] = 0;
+ } else {
+ lprintf("***LOG:*** -- "
+ "libmms: attempt to write beyond asf header limit");
+ }
}
}
}
--
1.7.0
>From e714a1410c260cb551a6c17dd4b8137644b9dc12 Mon Sep 17 00:00:00 2001
From: Hans de Goede <j.w.r.degoede(a)hhs.nl>
Date: Fri, 5 Feb 2010 17:39:54 +0100
Subject: [PATCH 02/22] Add support for GUID_ASF_EXTENDED_STREAM_PROPERTIES to mssh support
Patch from upstream bazar.
---
src/asfheader.h | 6 ++-
src/mmsh.c | 158 +++++++++++++++++++++++++++++++++++++++++--------------
2 files changed, 123 insertions(+), 41 deletions(-)
diff --git a/src/asfheader.h b/src/asfheader.h
index 09d94ed..2aaffb3 100644
--- a/src/asfheader.h
+++ b/src/asfheader.h
@@ -93,8 +93,9 @@
#define GUID_ASF_AUDIO_CONCEAL_NONE 34
#define GUID_ASF_CODEC_COMMENT1_HEADER 35
#define GUID_ASF_2_0_HEADER 36
+#define GUID_ASF_EXTENDED_STREAM_PROPERTIES 37
-#define GUID_END 37
+#define GUID_END 38
/* asf stream types */
@@ -256,6 +257,9 @@ static const struct
{ "asf 2.0 header",
{ 0xd6e229d1, 0x35da, 0x11d1, { 0x90, 0x34, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xbe }} },
+ { "extended stream properties",
+ { 0x14e6a5cb, 0xc672, 0x4332, { 0x83, 0x99, 0xa9, 0x69, 0x52, 0x06, 0x5b, 0x5a }} },
+
};
#endif
diff --git a/src/mmsh.c b/src/mmsh.c
index cd5ef9b..bc9da5a 100644
--- a/src/mmsh.c
+++ b/src/mmsh.c
@@ -605,6 +605,47 @@ static int get_header (mms_io_t *io, mmsh_t *this) {
}
}
+static void interp_stream_properties(mmsh_t *this, int i) {
+ uint16_t flags;
+ uint16_t stream_id;
+ int type;
+ int encrypted;
+ int guid;
+
+ guid = get_guid(this->asf_header, i);
+ switch (guid) {
+ case GUID_ASF_AUDIO_MEDIA:
+ type = ASF_STREAM_TYPE_AUDIO;
+ this->has_audio = 1;
+ break;
+
+ case GUID_ASF_VIDEO_MEDIA:
+ case GUID_ASF_JFIF_MEDIA:
+ case GUID_ASF_DEGRADABLE_JPEG_MEDIA:
+ type = ASF_STREAM_TYPE_VIDEO;
+ this->has_video = 1;
+ break;
+
+ case GUID_ASF_COMMAND_MEDIA:
+ type = ASF_STREAM_TYPE_CONTROL;
+ break;
+
+ default:
+ type = ASF_STREAM_TYPE_UNKNOWN;
+ }
+
+ flags = LE_16(this->asf_header + i + 48);
+ stream_id = flags & 0x7F;
+ encrypted = flags >> 15;
+
+ lprintf ("stream object, stream id: %d, type: %d, encrypted: %d\n",
+ stream_id, type, encrypted);
+
+ this->stream_types[stream_id] = type;
+ this->stream_ids[this->num_stream_ids] = stream_id;
+ this->num_stream_ids++;
+}
+
static void interp_header (mms_io_t *io, mmsh_t *this) {
int i;
@@ -651,46 +692,7 @@ static void interp_header (mms_io_t *io, mmsh_t *this) {
break;
case GUID_ASF_STREAM_PROPERTIES:
- {
- uint16_t flags;
- uint16_t stream_id;
- int type;
- int encrypted;
-
- guid = get_guid(this->asf_header, i);
- switch (guid) {
- case GUID_ASF_AUDIO_MEDIA:
- type = ASF_STREAM_TYPE_AUDIO;
- this->has_audio = 1;
- break;
-
- case GUID_ASF_VIDEO_MEDIA:
- case GUID_ASF_JFIF_MEDIA:
- case GUID_ASF_DEGRADABLE_JPEG_MEDIA:
- type = ASF_STREAM_TYPE_VIDEO;
- this->has_video = 1;
- break;
-
- case GUID_ASF_COMMAND_MEDIA:
- type = ASF_STREAM_TYPE_CONTROL;
- break;
-
- default:
- type = ASF_STREAM_TYPE_UNKNOWN;
- }
-
- flags = LE_16(this->asf_header + i + 48);
- stream_id = flags & 0x7F;
- encrypted = flags >> 15;
-
- lprintf ("stream object, stream id: %d, type: %d, encrypted: %d\n",
- stream_id, type, encrypted);
-
- this->stream_types[stream_id] = type;
- this->stream_ids[this->num_stream_ids] = stream_id;
- this->num_stream_ids++;
-
- }
+ interp_stream_properties(this, i);
break;
case GUID_ASF_STREAM_BITRATE_PROPERTIES:
@@ -714,6 +716,82 @@ static void interp_header (mms_io_t *io, mmsh_t *this) {
}
break;
+ case GUID_ASF_HEADER_EXTENSION:
+ {
+ int size = LE_32(this->asf_header + i + 18);
+ int j = 22;
+ int l;
+ lprintf("Extension header data size: %d\n", size);
+
+ while( (j+24) < length ) {
+ guid = get_guid(this->asf_header, i + j);
+ j += 16;
+
+ l = LE_64(this->asf_header + i + j);
+ j += 8;
+
+ switch(guid) {
+ case GUID_ASF_EXTENDED_STREAM_PROPERTIES:
+ {
+ int stream_no = LE_16(this->asf_header + i + j + 48);
+ int name_count = LE_16(this->asf_header + i + j + 60);
+ int ext_count = LE_16(this->asf_header + i + j + 62);
+ int ext_j = 64;
[...3403 lines suppressed...]
-
-
/*
* returns 1 on error
*/
static int mms_tcp_connect(mms_io_t *io, mms_t *this) {
- int progress, res;
-
if (!this->port) this->port = MMST_PORT;
/*
@@ -887,17 +864,6 @@ static int mms_tcp_connect(mms_io_t *io, mms_t *this) {
return 1;
}
- /* connection timeout 15s */
- progress = 0;
- do {
- /*FIXME: de-xine-ification */
-/* report_progress(this->stream, progress); */
- res = io_select(io, this->s, MMS_IO_WRITE_READY, 500);
- progress += 1;
- } while ((res == MMS_IO_STATUS_TIMEOUT) && (progress < 30));
- if (res != MMS_IO_STATUS_READY) {
- return 1;
- }
lprintf("mms: connected\n");
return 0;
}
@@ -1065,7 +1031,6 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
/* FIXME: needs proper error-signalling work */
this = (mms_t*) malloc (sizeof (mms_t));
- this->custom_data = data;
this->url = strdup (url);
this->s = -1;
this->seq_num = 0;
@@ -1085,9 +1050,6 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
this->current_pos = 0;
this->eos = 0;
- /* FIXME de-xine-ification */
-/* report_progress (stream, 0); */
-
this->guri = gnet_uri_new(this->url);
if(!this->guri) {
lprintf("mms: invalid url\n");
@@ -1115,8 +1077,6 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
if (mms_tcp_connect(io, this)) {
goto fail;
}
- /* FIXME de-xine-ification */
-/* report_progress (stream, 30); */
url_conv = iconv_open("UTF-16LE", "UTF-8");
if (url_conv == (iconv_t)-1) {
@@ -1157,9 +1117,6 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
goto fail;
}
- /* FIXME de-xine-ification */
-/* report_progress (stream, 40); */
-
/* TODO: insert network timing request here */
/* command 0x2 */
lprintf("mms: send command 0x02\n");
@@ -1197,9 +1154,6 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
goto fail;
}
- /* FIXME de-xine-ification */
-/* report_progress (stream, 50); */
-
/* command 0x5 */
{
mms_buffer_t command_buffer;
@@ -1252,9 +1206,6 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
goto fail;
}
- /* FIXME de-xine-ification */
-/* report_progress (stream, 60); */
-
/* command 0x15 */
lprintf("mms: send command 0x15\n");
{
@@ -1297,17 +1248,11 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
if (!this->asf_packet_len || !this->num_stream_ids)
goto fail;
- /* FIXME de-xine-ification */
-/* report_progress (stream, 70); */
-
if (!mms_choose_best_streams(io, this)) {
lprintf("mms: mms_choose_best_streams failed\n");
goto fail;
}
- /* FIXME de-xine-ification */
-/* report_progress (stream, 80); */
-
/* command 0x07 */
this->packet_id_type = ASF_MEDIA_PACKET_ID_TYPE;
{
@@ -1328,8 +1273,6 @@ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
}
}
-/* report_progress (stream, 100); */
-
iconv_close(url_conv);
lprintf("mms: connect: passed\n");
diff --git a/src/mmsh.c b/src/mmsh.c
index cd396c9..dd6e39d 100644
--- a/src/mmsh.c
+++ b/src/mmsh.c
@@ -151,9 +151,6 @@ static const char* mmsh_RangeRequest =
struct mmsh_s {
- /* FIXME: de-xine-ification */
- void *custom_data;
-
int s;
/* url parsing */
@@ -810,8 +807,6 @@ static int mmsh_valid_proto (char *proto) {
* returns 1 on error
*/
static int mmsh_tcp_connect(mms_io_t *io, mmsh_t *this) {
- int progress, res;
-
if (!this->connect_port) this->connect_port = MMSH_PORT;
/*
@@ -826,18 +821,6 @@ static int mmsh_tcp_connect(mms_io_t *io, mmsh_t *this) {
return 1;
}
- /* connection timeout 15s */
- progress = 0;
- do {
-// report_progress(this->stream, progress);
- res = io_select (io, this->s, MMS_IO_WRITE_READY, 500);
- progress += 1;
- } while ((res == MMS_IO_STATUS_TIMEOUT) && (progress < 30));
- if (res != MMS_IO_STATUS_READY) {
- close (this->s);
- this->s = -1;
- return 1;
- }
lprintf("mmsh: connected\n");
return 0;
@@ -862,7 +845,6 @@ static int mmsh_connect_int (mms_io_t *io, mmsh_t *this, off_t seek, uint32_t ti
if (mmsh_tcp_connect(io, this)) {
return 0;
}
-// report_progress (stream, 30);
/*
* let the negotiations begin...
@@ -890,8 +872,6 @@ static int mmsh_connect_int (mms_io_t *io, mmsh_t *this, off_t seek, uint32_t ti
goto fail;
close(this->s);
-// report_progress (stream, 20);
-
/* choose the best quality for the audio stream */
/* i've never seen more than one audio stream */
@@ -1041,7 +1021,6 @@ mmsh_t *mmsh_connect (mms_io_t *io, void *data, const char *url, int bandwidth)
if (!url)
return NULL;
-// report_progress (stream, 0);
/*
* initializatoin is essential here. the fail: label depends
* on the various char * in our this structure to be
@@ -1059,7 +1038,6 @@ mmsh_t *mmsh_connect (mms_io_t *io, void *data, const char *url, int bandwidth)
this->host_password = NULL;
this->uri = NULL;
- this->custom_data = data;
this->url = strdup(url);
if ((proxy_env = getenv("http_proxy")) != NULL)
this->proxy_url = strdup(proxy_env);
@@ -1078,8 +1056,6 @@ mmsh_t *mmsh_connect (mms_io_t *io, void *data, const char *url, int bandwidth)
this->user_bandwidth = bandwidth;
this->http_request_number = 1;
-// report_progress (stream, 0);
-
if (this->proxy_url) {
proxy_uri = gnet_uri_new(this->proxy_url);
if (!proxy_uri) {
--
1.7.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libmms/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 May 2008 13:22:17 -0000 1.2
+++ .cvsignore 18 Feb 2010 18:12:35 -0000 1.3
@@ -1 +1 @@
-libmms-0.4.tar.gz
+libmms-0.5.tar.gz
Index: libmms.spec
===================================================================
RCS file: /cvs/free/rpms/libmms/devel/libmms.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libmms.spec 29 Mar 2009 13:27:16 -0000 1.4
+++ libmms.spec 18 Feb 2010 18:12:35 -0000 1.5
@@ -1,11 +1,14 @@
Name: libmms
-Version: 0.4
-Release: 4%{?dist}
+Version: 0.5
+Release: 1%{?dist}
Summary: Library for Microsoft Media Server (MMS) streaming protocol
License: LGPLv2+
Group: System Environment/Libraries
-URL: http://libmms.sourceforge.net/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+URL: http://launchpad.net/libmms
+Source0: http://launchpad.net/libmms/trunk/0.5/+download/libmms-%{version}.tar.gz
+# Various patches from / heading into upstream bazar concatenated into 1
+# see the git headers inside the file for details
+Patch0: libmms-0.5-patches.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel
@@ -28,9 +31,11 @@
%prep
%setup -q
+%patch0 -p1
%build
+export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign"
%configure --disable-dependency-tracking --disable-static
make %{?_smp_mflags}
@@ -61,6 +66,13 @@
%changelog
+* Thu Feb 18 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5-1
+- New upstream release 0.5 (rf1053)
+- Fix some regressions introduced by upstream
+- Add a bunch of home grown patches (I used to be part of upstream, but
+ upstream has moved to launchpad), fixing several bugs and cleaning up
+ the code left and right, all these are submitted upstream
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.4-4
- rebuild for new F11 features
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libmms/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 May 2008 13:22:17 -0000 1.2
+++ sources 18 Feb 2010 18:12:35 -0000 1.3
@@ -1 +1 @@
-4a681a815186fe26bb1b02ccea57fb75 libmms-0.4.tar.gz
+cf83053ec891f14e73a04c84d9de08ee libmms-0.5.tar.gz
14 years, 9 months
rpms/transcode/F-11 transcode-1.1.5-no_video.patch, NONE, 1.1 transcode.spec, 1.15, 1.16
by David Juran
Author: juran
Update of /cvs/free/rpms/transcode/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16141
Modified Files:
transcode.spec
Added Files:
transcode-1.1.5-no_video.patch
Log Message:
- fix crash when using no video with the ogg exporter (Bz 1060)
transcode-1.1.5-no_video.patch:
export_ogg.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
--- NEW FILE transcode-1.1.5-no_video.patch ---
diff -up transcode-1.1.5/export/export_ogg.c.no_video transcode-1.1.5/export/export_ogg.c
--- transcode-1.1.5/export/export_ogg.c.no_video 2010-01-30 19:05:38.000000000 +0200
+++ transcode-1.1.5/export/export_ogg.c 2010-01-30 19:05:59.000000000 +0200
@@ -89,8 +89,9 @@ MOD_open
return(TC_EXPORT_ERROR);
}
- if (!strcmp(vob->video_out_file, vob->audio_out_file)) {
- tc_log_info(MOD_NAME, "Writing audio to \"/dev/null\" (no -m option)");
+ if (vob->video_out_file &&
+ !strcmp(vob->video_out_file, vob->audio_out_file)) {
+ tc_log_info(MOD_NAME, "Writing audio to \"/dev/null\" (no -m option)");
}
if (vob->mp3bitrate == 0)
result = tc_snprintf (buf, PATH_MAX, "oggenc -r -B %d -C %d -q %.2f %s -Q -o \"%s\" %s -",
@@ -214,10 +215,11 @@ MOD_close
pFile = NULL;
if (verbose > 0 && strcmp (vob->audio_out_file, "/dev/null") &&
- strcmp (vob->video_out_file, "/dev/null")!=0) {
- tc_log_info (MOD_NAME, "Hint: Now merge the files with");
- tc_log_info (MOD_NAME, "Hint: ogmmerge -o complete.ogg %s %s",
- vob->video_out_file, vob->audio_out_file );
+ vob->video_out_file &&
+ strcmp (vob->video_out_file, "/dev/null")!=0) {
+ tc_log_info (MOD_NAME, "Hint: Now merge the files with");
+ tc_log_info (MOD_NAME, "Hint: ogmmerge -o complete.ogg %s %s",
+ vob->video_out_file, vob->audio_out_file );
}
return(0);
Index: transcode.spec
===================================================================
RCS file: /cvs/free/rpms/transcode/F-11/transcode.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- transcode.spec 4 Jul 2009 21:55:10 -0000 1.15
+++ transcode.spec 18 Feb 2010 17:30:41 -0000 1.16
@@ -7,7 +7,7 @@
Name: transcode
Version: 1.1.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
@@ -17,6 +17,7 @@
Patch0: %{name}-pvmbin.patch
Patch3: transcode-1.0.4.external_dv.patch
Patch4: transcode-1.1.1-textrel.patch
+Patch5: transcode-1.1.5-no_video.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +70,8 @@
%patch0 -p1 -b .pvmbin
%patch3 -p1 -b .external_dv
%patch4 -p1 -b .textrel
+%patch5 -p1 -b .no_video
+
rm filter/preview/dv_types.h
rm import/v4l/videodev.h
rm import/v4l/videodev2.h
@@ -138,6 +141,9 @@
%changelog
+* Sat Jan 30 2010 David Juran <david(a)juran.se> - 1.1.1-7
+- fix crash when using no video with the ogg exporter (Bz 1060)
+
* Sat Jul 4 2009 David Juran <david(a)juran.se> - 1.1.1-6
- Fix TEXTREL (Bz 658)
- Update URL
14 years, 9 months
rpms/transcode/devel transcode-1.1.5-no_video.patch, NONE, 1.1 transcode.spec, 1.22, 1.23
by David Juran
Author: juran
Update of /cvs/free/rpms/transcode/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15873
Modified Files:
transcode.spec
Added Files:
transcode-1.1.5-no_video.patch
Log Message:
- fix crash when using no video with the ogg exporter (Bz 1060)
transcode-1.1.5-no_video.patch:
export_ogg.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
--- NEW FILE transcode-1.1.5-no_video.patch ---
diff -up transcode-1.1.5/export/export_ogg.c.no_video transcode-1.1.5/export/export_ogg.c
--- transcode-1.1.5/export/export_ogg.c.no_video 2010-01-30 19:05:38.000000000 +0200
+++ transcode-1.1.5/export/export_ogg.c 2010-01-30 19:05:59.000000000 +0200
@@ -89,8 +89,9 @@ MOD_open
return(TC_EXPORT_ERROR);
}
- if (!strcmp(vob->video_out_file, vob->audio_out_file)) {
- tc_log_info(MOD_NAME, "Writing audio to \"/dev/null\" (no -m option)");
+ if (vob->video_out_file &&
+ !strcmp(vob->video_out_file, vob->audio_out_file)) {
+ tc_log_info(MOD_NAME, "Writing audio to \"/dev/null\" (no -m option)");
}
if (vob->mp3bitrate == 0)
result = tc_snprintf (buf, PATH_MAX, "oggenc -r -B %d -C %d -q %.2f %s -Q -o \"%s\" %s -",
@@ -214,10 +215,11 @@ MOD_close
pFile = NULL;
if (verbose > 0 && strcmp (vob->audio_out_file, "/dev/null") &&
- strcmp (vob->video_out_file, "/dev/null")!=0) {
- tc_log_info (MOD_NAME, "Hint: Now merge the files with");
- tc_log_info (MOD_NAME, "Hint: ogmmerge -o complete.ogg %s %s",
- vob->video_out_file, vob->audio_out_file );
+ vob->video_out_file &&
+ strcmp (vob->video_out_file, "/dev/null")!=0) {
+ tc_log_info (MOD_NAME, "Hint: Now merge the files with");
+ tc_log_info (MOD_NAME, "Hint: ogmmerge -o complete.ogg %s %s",
+ vob->video_out_file, vob->audio_out_file );
}
return(0);
Index: transcode.spec
===================================================================
RCS file: /cvs/free/rpms/transcode/devel/transcode.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- transcode.spec 7 Nov 2009 14:09:11 -0000 1.22
+++ transcode.spec 18 Feb 2010 17:29:45 -0000 1.23
@@ -7,7 +7,7 @@
Name: transcode
Version: 1.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
@@ -16,7 +16,8 @@
Source0: http://prdownload.berlios.de/tcforge/%{name}-%{version}.tar.bz2
Patch0: %{name}-pvmbin.patch
Patch3: transcode-1.0.4.external_dv.patch
-Patch4: transcode-1.1.5-fix_v4l.patch
+Patch4: transcode-1.1.5-fix_v4l.patch
+Patch5: transcode-1.1.5-no_video.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,8 +72,8 @@
%setup -q
%patch0 -p1 -b .pvmbin
%patch3 -p1 -b .external_dv
-%patch4 -p1 -b .fix_v4l
-
+%patch4 -p1 -b .fix_v4l
+%patch5 -p1 -b .no_video
rm filter/preview/dv_types.h
rm import/v4l/videodev.h
@@ -150,6 +151,9 @@
%changelog
+* Sat Jan 30 2010 David Juran <david(a)juran.se> - 1.1.5-3
+- fix crash when using no video with the ogg exporter (Bz 1060)
+
* Sat Nov 7 2009 David Juran <david(a)juran.se> - 1.1.5-2
- explicitly (re-)enabled libmpeg2 support (Bz 922)
14 years, 9 months
rpms/transcode/F-12 transcode-1.1.5-no_video.patch, NONE, 1.1 transcode.spec, 1.22, 1.23
by David Juran
Author: juran
Update of /cvs/free/rpms/transcode/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14615
Modified Files:
transcode.spec
Added Files:
transcode-1.1.5-no_video.patch
Log Message:
- fix crash when using no video with the ogg exporter (Bz 1060)
transcode-1.1.5-no_video.patch:
export_ogg.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
--- NEW FILE transcode-1.1.5-no_video.patch ---
diff -up transcode-1.1.5/export/export_ogg.c.no_video transcode-1.1.5/export/export_ogg.c
--- transcode-1.1.5/export/export_ogg.c.no_video 2010-01-30 19:05:38.000000000 +0200
+++ transcode-1.1.5/export/export_ogg.c 2010-01-30 19:05:59.000000000 +0200
@@ -89,8 +89,9 @@ MOD_open
return(TC_EXPORT_ERROR);
}
- if (!strcmp(vob->video_out_file, vob->audio_out_file)) {
- tc_log_info(MOD_NAME, "Writing audio to \"/dev/null\" (no -m option)");
+ if (vob->video_out_file &&
+ !strcmp(vob->video_out_file, vob->audio_out_file)) {
+ tc_log_info(MOD_NAME, "Writing audio to \"/dev/null\" (no -m option)");
}
if (vob->mp3bitrate == 0)
result = tc_snprintf (buf, PATH_MAX, "oggenc -r -B %d -C %d -q %.2f %s -Q -o \"%s\" %s -",
@@ -214,10 +215,11 @@ MOD_close
pFile = NULL;
if (verbose > 0 && strcmp (vob->audio_out_file, "/dev/null") &&
- strcmp (vob->video_out_file, "/dev/null")!=0) {
- tc_log_info (MOD_NAME, "Hint: Now merge the files with");
- tc_log_info (MOD_NAME, "Hint: ogmmerge -o complete.ogg %s %s",
- vob->video_out_file, vob->audio_out_file );
+ vob->video_out_file &&
+ strcmp (vob->video_out_file, "/dev/null")!=0) {
+ tc_log_info (MOD_NAME, "Hint: Now merge the files with");
+ tc_log_info (MOD_NAME, "Hint: ogmmerge -o complete.ogg %s %s",
+ vob->video_out_file, vob->audio_out_file );
}
return(0);
Index: transcode.spec
===================================================================
RCS file: /cvs/free/rpms/transcode/F-12/transcode.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- transcode.spec 7 Nov 2009 14:09:11 -0000 1.22
+++ transcode.spec 18 Feb 2010 17:15:51 -0000 1.23
@@ -7,7 +7,7 @@
Name: transcode
Version: 1.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
@@ -16,7 +16,8 @@
Source0: http://prdownload.berlios.de/tcforge/%{name}-%{version}.tar.bz2
Patch0: %{name}-pvmbin.patch
Patch3: transcode-1.0.4.external_dv.patch
-Patch4: transcode-1.1.5-fix_v4l.patch
+Patch4: transcode-1.1.5-fix_v4l.patch
+Patch5: transcode-1.1.5-no_video.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,8 +72,8 @@
%setup -q
%patch0 -p1 -b .pvmbin
%patch3 -p1 -b .external_dv
-%patch4 -p1 -b .fix_v4l
-
+%patch4 -p1 -b .fix_v4l
+%patch5 -p1 -b .no_video
rm filter/preview/dv_types.h
rm import/v4l/videodev.h
@@ -150,6 +151,9 @@
%changelog
+* Sat Jan 30 2010 David Juran <david(a)juran.se> - 1.1.5-3
+- fix crash when using no video with the ogg exporter (Bz 1060)
+
* Sat Nov 7 2009 David Juran <david(a)juran.se> - 1.1.5-2
- explicitly (re-)enabled libmpeg2 support (Bz 922)
14 years, 9 months
rpms/gstreamer-plugins-bad/F-12 gstreamer-plugins-bad.spec, 1.32, 1.33
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-bad/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5236
Modified Files:
gstreamer-plugins-bad.spec
Log Message:
* Thu Feb 4 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.17-4
- Require new gstreamer-plugins-bad-free which is now in Fedora
- Drop all files found in gstreamer-plugins-bad-free
- Drop all subpackages (all subpackages of gstreamer-plugins-bad-free now)
Index: gstreamer-plugins-bad.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/F-12/gstreamer-plugins-bad.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gstreamer-plugins-bad.spec 18 Feb 2010 09:20:00 -0000 1.32
+++ gstreamer-plugins-bad.spec 18 Feb 2010 09:39:14 -0000 1.33
@@ -5,7 +5,11 @@
%define gstpb_minver 0.10.22.1
# which plugins to actually build and install
+%ifarch %{ix86} x86_64
%define gstdirs gst/asfmux gst/dvdspu gst/mpegpsmux gst/mpegtsmux gst/qtmux gst/real gst/siren
+%else
+%define gstdirs gst/asfmux gst/dvdspu gst/mpegpsmux gst/mpegtsmux gst/qtmux gst/siren
+%endif
%define extdirs ext/dts ext/faad ext/libmms ext/mimic ext/mpeg2enc ext/mplex ext/xvid
Summary: GStreamer streaming media framework "bad" plug-ins
14 years, 9 months
rpms/gstreamer-plugins-bad/F-12 gstreamer-plugins-bad.spec, 1.31, 1.32 gst-plugins-bad-0.10.16-celt-compile-fixes.patch, 1.1, NONE
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-bad/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3449
Modified Files:
gstreamer-plugins-bad.spec
Removed Files:
gst-plugins-bad-0.10.16-celt-compile-fixes.patch
Log Message:
* Thu Feb 4 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.17-4
- Require new gstreamer-plugins-bad-free which is now in Fedora
- Drop all files found in gstreamer-plugins-bad-free
- Drop all subpackages (all subpackages of gstreamer-plugins-bad-free now)
Index: gstreamer-plugins-bad.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/F-12/gstreamer-plugins-bad.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gstreamer-plugins-bad.spec 4 Dec 2009 12:12:28 -0000 1.31
+++ gstreamer-plugins-bad.spec 18 Feb 2010 09:20:00 -0000 1.32
@@ -4,17 +4,22 @@
%define gst_minver 0.10.22.1
%define gstpb_minver 0.10.22.1
+# which plugins to actually build and install
+%define gstdirs gst/asfmux gst/dvdspu gst/mpegpsmux gst/mpegtsmux gst/qtmux gst/real gst/siren
+%define extdirs ext/dts ext/faad ext/libmms ext/mimic ext/mpeg2enc ext/mplex ext/xvid
+
Summary: GStreamer streaming media framework "bad" plug-ins
Name: gstreamer-plugins-bad
Version: 0.10.17
-Release: 2%{?dist}
-# The freeze and nfs plugins are LGPLv2 (only)
-License: LGPLv2+ and LGPLv2
+Release: 4%{?dist}
+License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
Source: http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{ve...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{gstreamer} >= %{gst_minver}
+# Drag in the free plugins which are in Fedora now, for upgrade path
+Requires: gstreamer-plugins-bad-free >= %{version}
BuildRequires: %{gstreamer}-devel >= %{gst_minver}
BuildRequires: %{gstreamer}-plugins-base-devel >= %{gstpb_minver}
@@ -23,52 +28,14 @@
BuildRequires: PyXML
BuildRequires: libXt-devel
BuildRequireS: gtk-doc
-# for gstcamera
-BuildRequires: libglade2-devel
-
BuildRequires: liboil-devel
-BuildRequires: directfb-devel
BuildRequires: libdca-devel
BuildRequires: faad2-devel
-BuildRequires: gsm-devel
-BuildRequires: libmpcdec-devel
-BuildRequires: SDL-devel
-BuildRequires: soundtouch-devel
-#BuildRequires: swfdec-devel
-Buildrequires: wavpack-devel
BuildRequires: xvidcore-devel
-BuildRequires: bzip2-devel
-BuildRequires: mesa-libGLU-devel
-BuildRequires: neon-devel
BuildRequires: libmms-devel
-BuildRequires: libmusicbrainz-devel
-BuildRequires: libcdaudio-devel
-BuildRequires: jack-audio-connection-kit-devel
BuildRequires: mjpegtools-devel
-BuildRequires: nas-devel
-BuildRequires: wildmidi-devel
-BuildRequires: libsndfile-devel
-BuildRequires: libmodplug-devel
-BuildRequires: libtimidity-devel
-BuildRequires: gmyth-devel >= 0.4
-BuildRequires: libdc1394-devel
-BuildRequires: libexif-devel
-BuildRequires: libiptcdata-devel
-BuildRequires: exempi-devel
-BuildRequires: dirac-devel
-BuildRequires: libofa-devel
-BuildRequires: libdvdnav-devel
-BuildRequires: jasper-devel
-BuildRequires: openssl-devel
BuildRequires: twolame-devel
-BuildRequires: celt-devel
-BuildRequires: libass-devel
BuildRequires: libmimic-devel
-BuildRequires: zbar-devel
-BuildRequires: libkate-devel
-BuildRequires: slv2-devel
-BuildRequires: librsvg2-devel
-BuildRequires: ladspa-devel
%description
GStreamer is a streaming media framework, based on graphs of elements which
@@ -78,222 +45,77 @@
well enough, or the code is not of good enough quality.
-%package extras
-Summary: Extra GStreamer "bad" plugins (less often used "bad" plugins)
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-
-%description extras
-GStreamer is a streaming media framework, based on graphs of elements which
-operate on media data.
-
-gstreamer-plugins-bad contains plug-ins that have licensing issues, aren't
-tested well enough, or the code is not of good enough quality.
-
-This package (gstreamer-plugins-bad-extras) contains extra "bad" plugins for
-sources (mythtv), sinks (jack, nas) and effects (pitch) which are not used
-very much and require additional libraries to be installed.
-
-
-%package devel
-Summary: Development files for the GStreamer media framework "bad" plug-ins
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: gstreamer-plugins-base-devel
-
-%description devel
-GStreamer is a streaming media framework, based on graphs of elements which
-operate on media data.
-
-This package contains the development files for the plug-ins that have
-licensing issues, aren't tested well enough, or the code is not of good
-enough quality.
-
-
-%package devel-docs
-Summary: Development documentation for the GStreamer "bad" plug-ins
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description devel-docs
-GStreamer is a streaming media framework, based on graphs of elements which
-operate on media data.
-
-This package contains the development documentation for the plug-ins that have
-licensing issues, aren't tested well enough, or the code is not of good
-enough quality.
-
-
%prep
%setup -q -n gst-plugins-bad-%{version}
%build
-# Disable selector, mpegdemux and schroedinger, they are patched into Fedora
-# Disable amrwb (enc), faac and vdpau as they do not belong in rpmfusion-free
-# Disable farsight plugins, they are patched into Fedora's packages
+# Note we don't bother with disabling everything which is in Fedora, that
+# is unmaintainable, instead we selectively run make in subdirs
%configure \
--with-package-name="gst-plugins-bad rpmfusion rpm" \
--with-package-origin="http://rpmfusion.org/" \
- --enable-debug --disable-static --enable-gtk-doc --enable-experimental \
- --disable-mpegdemux --disable-selector --disable-schro \
- --disable-amrwb --disable-faac --disable-vdpau \
- --disable-valve --disable-dtmf --disable-autoconvert \
- --disable-liveadder --disable-rtpmux
+ --enable-debug --disable-static --enable-experimental
# Don't use rpath!
-%{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-%{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-%{__make} %{?_smp_mflags}
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+for i in %{gstdirs} %{extdirs}; do
+ pushd $i
+ make %{?_smp_mflags} V=2
+ popd
+done
%install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR="%{buildroot}"
-%find_lang gst-plugins-bad-%{majorminor}
+rm -rf $RPM_BUILD_ROOT
+for i in %{gstdirs} %{extdirs}; do
+ pushd $i
+ make install V=2 DESTDIR=$RPM_BUILD_ROOT
+ popd
+done
# Clean out files that should not be part of the rpm.
-%{__rm} -f %{buildroot}%{_libdir}/gstreamer-%{majorminor}/*.la
-%{__rm} -f %{buildroot}%{_libdir}/*.la
+rm %{buildroot}%{_libdir}/gstreamer-%{majorminor}/*.la
%clean
-%{__rm} -rf %{buildroot}
-
-
-%post -p /sbin/ldconfig
+rm -rf $RPM_BUILD_ROOT
-%postun -p /sbin/ldconfig
-
-%files -f gst-plugins-bad-%{majorminor}.lang
+%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README REQUIREMENTS
-%{_bindir}/gst-camera
-%{_bindir}/gst-camera-perf
-%{_datadir}/gstreamer-%{majorminor}
-%{_libdir}/libgstbasevideo-%{majorminor}.so.*
-%{_libdir}/libgstphotography-%{majorminor}.so.*
-%{_libdir}/libgstsignalprocessor-%{majorminor}.so.*
+
# Plugins without external dependencies
-%{_libdir}/gstreamer-%{majorminor}/libgstaacparse.so
-%{_libdir}/gstreamer-%{majorminor}/libgstadpcmdec.so
-%{_libdir}/gstreamer-%{majorminor}/libgstaiff.so
-%{_libdir}/gstreamer-%{majorminor}/libgstamrparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstasfmux.so
-%{_libdir}/gstreamer-%{majorminor}/libgstbayer.so
-%{_libdir}/gstreamer-%{majorminor}/libgstcamerabin.so
-%{_libdir}/gstreamer-%{majorminor}/libgstcdxaparse.so
-%{_libdir}/gstreamer-%{majorminor}/libgstdccp.so
%{_libdir}/gstreamer-%{majorminor}/libgstdvdspu.so
-%{_libdir}/gstreamer-%{majorminor}/libgstfestival.so
-%{_libdir}/gstreamer-%{majorminor}/libgstfreeze.so
-%{_libdir}/gstreamer-%{majorminor}/libgstfrei0r.so
-%{_libdir}/gstreamer-%{majorminor}/libgsth264parse.so
-%{_libdir}/gstreamer-%{majorminor}/libgsthdvparse.so
-%{_libdir}/gstreamer-%{majorminor}/libgstid3tag.so
-%{_libdir}/gstreamer-%{majorminor}/libgstlegacyresample.so
-%{_libdir}/gstreamer-%{majorminor}/libgstrfbsrc.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmpeg4videoparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstmpegpsmux.so
%{_libdir}/gstreamer-%{majorminor}/libgstmpegtsmux.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmpegvideoparse.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmve.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmxf.so
-%{_libdir}/gstreamer-%{majorminor}/libgstnsf.so
-%{_libdir}/gstreamer-%{majorminor}/libgstnuvdemux.so
-%{_libdir}/gstreamer-%{majorminor}/libgstpcapparse.so
-%{_libdir}/gstreamer-%{majorminor}/libgstpnm.so
%{_libdir}/gstreamer-%{majorminor}/libgstqtmux.so
-%{_libdir}/gstreamer-%{majorminor}/libgstrawparse.so
%ifarch %{ix86} x86_64
%{_libdir}/gstreamer-%{majorminor}/libgstreal.so
%endif
-%{_libdir}/gstreamer-%{majorminor}/libgstscaletempoplugin.so
-%{_libdir}/gstreamer-%{majorminor}/libgstsdpelem.so
-%{_libdir}/gstreamer-%{majorminor}/libgstshapewipe.so
%{_libdir}/gstreamer-%{majorminor}/libgstsiren.so
-%{_libdir}/gstreamer-%{majorminor}/libgstspeed.so
-%{_libdir}/gstreamer-%{majorminor}/libgststereo.so
-%{_libdir}/gstreamer-%{majorminor}/libgstsubenc.so
-%{_libdir}/gstreamer-%{majorminor}/libgsttta.so
-%{_libdir}/gstreamer-%{majorminor}/libgstvideomeasure.so
-%{_libdir}/gstreamer-%{majorminor}/libgstvideosignal.so
-%{_libdir}/gstreamer-%{majorminor}/libgstvmnc.so
-
-# System (Linux) specific plugins
-%{_libdir}/gstreamer-%{majorminor}/libgstdvb.so
-%{_libdir}/gstreamer-%{majorminor}/libgstfbdevsink.so
-%{_libdir}/gstreamer-%{majorminor}/libgstoss4audio.so
-%{_libdir}/gstreamer-%{majorminor}/libgstvcdsrc.so
# Plugins with external dependencies
-%{_libdir}/gstreamer-%{majorminor}/libgstalsaspdif.so
-%{_libdir}/gstreamer-%{majorminor}/libgstapexsink.so
-%{_libdir}/gstreamer-%{majorminor}/libgstassrender.so
-%{_libdir}/gstreamer-%{majorminor}/libgstbz2.so
-%{_libdir}/gstreamer-%{majorminor}/libgstcdaudio.so
-%{_libdir}/gstreamer-%{majorminor}/libgstcelt.so
-%{_libdir}/gstreamer-%{majorminor}/libgstdc1394.so
-%{_libdir}/gstreamer-%{majorminor}/libgstdfbvideosink.so
-%{_libdir}/gstreamer-%{majorminor}/libgstdirac.so
%{_libdir}/gstreamer-%{majorminor}/libgstdtsdec.so
%{_libdir}/gstreamer-%{majorminor}/libgstfaad.so
-%{_libdir}/gstreamer-%{majorminor}/libgstgsm.so
-%{_libdir}/gstreamer-%{majorminor}/libgstjp2k.so
-%{_libdir}/gstreamer-%{majorminor}/libgstkate.so
-%{_libdir}/gstreamer-%{majorminor}/libgstladspa.so
-%{_libdir}/gstreamer-%{majorminor}/libgstlv2.so
%{_libdir}/gstreamer-%{majorminor}/libgstmms.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmetadata.so
%{_libdir}/gstreamer-%{majorminor}/libgstmimic.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmodplug.so
%{_libdir}/gstreamer-%{majorminor}/libgstmpeg2enc.so
%{_libdir}/gstreamer-%{majorminor}/libgstmplex.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmusepack.so
-#if 0%{?fedora} >= 9
-%{_libdir}/gstreamer-%{majorminor}/libgstneonhttpsrc.so
-#endif
-%{_libdir}/gstreamer-%{majorminor}/libgstofa.so
-%{_libdir}/gstreamer-%{majorminor}/libgstrsvg.so
-%{_libdir}/gstreamer-%{majorminor}/libgstsdl.so
-%{_libdir}/gstreamer-%{majorminor}/libgstsndfile.so
-#%{_libdir}/gstreamer-%{majorminor}/libgstswfdec.so
-%{_libdir}/gstreamer-%{majorminor}/libgsttrm.so
%{_libdir}/gstreamer-%{majorminor}/libgstxvid.so
-%{_libdir}/gstreamer-%{majorminor}/libgstzbar.so
-%{_libdir}/gstreamer-%{majorminor}/libresindvd.so
-
-#debugging plugin
-%{_libdir}/gstreamer-%{majorminor}/libgstdebugutilsbad.so
-
-%files extras
-%defattr(-,root,root,-)
-# Plugins with external dependencies
-%{_libdir}/gstreamer-%{majorminor}/libgstjack.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmythtvsrc.so
-%{_libdir}/gstreamer-%{majorminor}/libgstnassink.so
-%{_libdir}/gstreamer-%{majorminor}/libgstsoundtouch.so
-%{_libdir}/gstreamer-%{majorminor}/libgsttimidity.so
-%{_libdir}/gstreamer-%{majorminor}/libgstwildmidi.so
-
-
-%files devel
-%defattr(-,root,root,-)
-%{_libdir}/libgstbasevideo-%{majorminor}.so
-%{_libdir}/libgstphotography-%{majorminor}.so
-%{_libdir}/libgstsignalprocessor-%{majorminor}.so
-%{_includedir}/gstreamer-%{majorminor}/gst/interfaces/photography*
-%{_includedir}/gstreamer-%{majorminor}/gst/signalprocessor
-%{_includedir}/gstreamer-%{majorminor}/gst/video
+%changelog
+* Thu Feb 4 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.17-4
+- Require new gstreamer-plugins-bad-free which is now in Fedora
+- Drop all files found in gstreamer-plugins-bad-free
+- Drop all subpackages (all subpackages of gstreamer-plugins-bad-free now)
-%files devel-docs
-%defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/gst-plugins-bad-plugins-%{majorminor}
-
+* Sat Dec 19 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.17-3
+- Disable muscbrainz / trm plugin (#1001)
-%changelog
* Fri Dec 4 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.17-2
- Enable LADSPA plugins (#992)
--- gst-plugins-bad-0.10.16-celt-compile-fixes.patch DELETED ---
14 years, 9 months