rpms/gstreamer-ffmpeg/devel .cvsignore, 1.14, 1.15 gstreamer-ffmpeg.spec, 1.24, 1.25 sources, 1.14, 1.15
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26202
Modified Files:
.cvsignore gstreamer-ffmpeg.spec sources
Log Message:
* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-6
- Upgrade the buildin libav to 0.8.5 to get all the security fixes from
upstream libav
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 4 Nov 2012 16:16:38 -0000 1.14
+++ .cvsignore 2 Mar 2013 12:20:25 -0000 1.15
@@ -1,2 +1,2 @@
gst-ffmpeg-0.10.13.tar.bz2
-libav-0.8.4.tar.xz
+libav-0.8.5.tar.xz
Index: gstreamer-ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/gstreamer-ffmpeg.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gstreamer-ffmpeg.spec 24 Nov 2012 15:01:43 -0000 1.24
+++ gstreamer-ffmpeg.spec 2 Mar 2013 12:20:25 -0000 1.25
@@ -1,6 +1,6 @@
Name: gstreamer-ffmpeg
Version: 0.10.13
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: GStreamer FFmpeg-based plug-ins
Group: Applications/Multimedia
# the ffmpeg plugin is LGPL, the postproc plugin is GPL
@@ -8,7 +8,7 @@
URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-%{version}.tar...
# We drop in a newer libav to get all the security bugfixes from there!
-Source1: http://libav.org/releases/libav-0.8.4.tar.xz
+Source1: http://libav.org/releases/libav-0.8.5.tar.xz
Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
# Patches cherry picked from upstream for newer libav and bugfixes
Patch1: 0001-configure.ac-Fix-for-new-libav.patch
@@ -44,7 +44,7 @@
%prep
%setup -q -n gst-ffmpeg-%{version} -a 1
rm -r gst-libs/ext/libav
-mv libav-0.8.4 gst-libs/ext/libav
+mv libav-0.8.5 gst-libs/ext/libav
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -83,6 +83,10 @@
%changelog
+* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-6
+- Upgrade the buildin libav to 0.8.5 to get all the security fixes from
+ upstream libav
+
* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.13-5
- Rebuilt for FFmpeg 1.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 4 Nov 2012 16:16:38 -0000 1.14
+++ sources 2 Mar 2013 12:20:25 -0000 1.15
@@ -1,2 +1,2 @@
7f5beacaf1312db2db30a026b36888c4 gst-ffmpeg-0.10.13.tar.bz2
-4634b35dec327f9aba61b3b894df03f7 libav-0.8.4.tar.xz
+3f0fd111575e91c8d57bd8b4d5e3802a libav-0.8.5.tar.xz
11 years, 1 month
rpms/gstreamer1-plugins-bad-freeworld/F-18 .cvsignore, 1.2, 1.3 gstreamer1-plugins-bad-freeworld.spec, 1.1, 1.2 sources, 1.2, 1.3
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer1-plugins-bad-freeworld/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24468
Modified Files:
.cvsignore gstreamer1-plugins-bad-freeworld.spec sources
Log Message:
* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.0.5-1
- New upstream release 1.0.5
- Drop no longer needed PyXML BuildRequires (rf#2572)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-plugins-bad-freeworld/F-18/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 10 Nov 2012 16:13:56 -0000 1.2
+++ .cvsignore 2 Mar 2013 11:16:24 -0000 1.3
@@ -1 +1 @@
-gst-plugins-bad-1.0.2.tar.xz
+gst-plugins-bad-1.0.5.tar.xz
Index: gstreamer1-plugins-bad-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-plugins-bad-freeworld/F-18/gstreamer1-plugins-bad-freeworld.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gstreamer1-plugins-bad-freeworld.spec 10 Nov 2012 16:13:56 -0000 1.1
+++ gstreamer1-plugins-bad-freeworld.spec 2 Mar 2013 11:16:24 -0000 1.2
@@ -4,8 +4,8 @@
Summary: GStreamer 1.0 streaming media framework "bad" plug-ins
Name: gstreamer1-plugins-bad-freeworld
-Version: 1.0.2
-Release: 2%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -14,7 +14,6 @@
BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0
BuildRequires: check
BuildRequires: gettext-devel
-BuildRequires: PyXML
BuildRequires: libXt-devel
BuildRequires: gtk-doc
BuildRequires: orc-devel
@@ -92,6 +91,10 @@
%changelog
+* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.0.5-1
+- New upstream release 1.0.5
+- Drop no longer needed PyXML BuildRequires (rf#2572)
+
* Sat Nov 3 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.0.2-2
- Include some more files in %%doc (rf#2473)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-plugins-bad-freeworld/F-18/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 10 Nov 2012 16:13:56 -0000 1.2
+++ sources 2 Mar 2013 11:16:24 -0000 1.3
@@ -1 +1 @@
-17f2ba1b51347061f8f81436d6c7b65e gst-plugins-bad-1.0.2.tar.xz
+07ed29084e0de968cdd1675f7ee228e2 gst-plugins-bad-1.0.5.tar.xz
11 years, 1 month
rpms/gstreamer1-plugins-bad-freeworld/devel .cvsignore, 1.2, 1.3 gstreamer1-plugins-bad-freeworld.spec, 1.1, 1.2 sources, 1.2, 1.3
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer1-plugins-bad-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24351
Modified Files:
.cvsignore gstreamer1-plugins-bad-freeworld.spec sources
Log Message:
* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.0.5-1
- New upstream release 1.0.5
- Drop no longer needed PyXML BuildRequires (rf#2572)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-plugins-bad-freeworld/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 10 Nov 2012 16:11:58 -0000 1.2
+++ .cvsignore 2 Mar 2013 11:15:43 -0000 1.3
@@ -1 +1 @@
-gst-plugins-bad-1.0.2.tar.xz
+gst-plugins-bad-1.0.5.tar.xz
Index: gstreamer1-plugins-bad-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-plugins-bad-freeworld/devel/gstreamer1-plugins-bad-freeworld.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gstreamer1-plugins-bad-freeworld.spec 10 Nov 2012 16:11:58 -0000 1.1
+++ gstreamer1-plugins-bad-freeworld.spec 2 Mar 2013 11:15:43 -0000 1.2
@@ -4,8 +4,8 @@
Summary: GStreamer 1.0 streaming media framework "bad" plug-ins
Name: gstreamer1-plugins-bad-freeworld
-Version: 1.0.2
-Release: 2%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -14,7 +14,6 @@
BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0
BuildRequires: check
BuildRequires: gettext-devel
-BuildRequires: PyXML
BuildRequires: libXt-devel
BuildRequires: gtk-doc
BuildRequires: orc-devel
@@ -92,6 +91,10 @@
%changelog
+* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.0.5-1
+- New upstream release 1.0.5
+- Drop no longer needed PyXML BuildRequires (rf#2572)
+
* Sat Nov 3 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.0.2-2
- Include some more files in %%doc (rf#2473)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-plugins-bad-freeworld/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 10 Nov 2012 16:11:58 -0000 1.2
+++ sources 2 Mar 2013 11:15:43 -0000 1.3
@@ -1 +1 @@
-17f2ba1b51347061f8f81436d6c7b65e gst-plugins-bad-1.0.2.tar.xz
+07ed29084e0de968cdd1675f7ee228e2 gst-plugins-bad-1.0.5.tar.xz
11 years, 1 month
rpms/gstreamer-plugins-bad/devel gstreamer-plugins-bad.spec, 1.48, 1.49
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-bad/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24189
Modified Files:
gstreamer-plugins-bad.spec
Log Message:
* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.23-3
- Drop no longer needed PyXML BuildRequires (rf#2572)
Index: gstreamer-plugins-bad.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/devel/gstreamer-plugins-bad.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gstreamer-plugins-bad.spec 10 Nov 2012 16:25:36 -0000 1.48
+++ gstreamer-plugins-bad.spec 2 Mar 2013 11:13:11 -0000 1.49
@@ -15,7 +15,7 @@
Summary: GStreamer streaming media framework "bad" plug-ins
Name: gstreamer-plugins-bad
Version: 0.10.23
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -28,7 +28,6 @@
BuildRequires: check
BuildRequires: gettext-devel
-BuildRequires: PyXML
BuildRequires: libXt-devel
BuildRequireS: gtk-doc
BuildRequires: liboil-devel
@@ -108,6 +107,9 @@
%changelog
+* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.23-3
+- Drop no longer needed PyXML BuildRequires (rf#2572)
+
* Sat Nov 10 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.23-2
- Add/enable vo-amrwbenc plugin
11 years, 1 month
rpms/gstreamer1-plugins-ugly/F-18 .cvsignore, 1.3, 1.4 gstreamer1-plugins-ugly.spec, 1.3, 1.4 sources, 1.3, 1.4
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer1-plugins-ugly/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23862
Modified Files:
.cvsignore gstreamer1-plugins-ugly.spec sources
Log Message:
* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.0.5-1
- New upstream release 1.0.5
- Drop no longer needed PyXML BuildRequires (rf#2572)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-plugins-ugly/F-18/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 28 Oct 2012 16:13:19 -0000 1.3
+++ .cvsignore 2 Mar 2013 11:07:51 -0000 1.4
@@ -1 +1 @@
-gst-plugins-ugly-1.0.2.tar.xz
+gst-plugins-ugly-1.0.5.tar.xz
Index: gstreamer1-plugins-ugly.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-plugins-ugly/F-18/gstreamer1-plugins-ugly.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gstreamer1-plugins-ugly.spec 23 Nov 2012 22:43:35 -0000 1.3
+++ gstreamer1-plugins-ugly.spec 2 Mar 2013 11:07:52 -0000 1.4
@@ -1,7 +1,7 @@
Summary: GStreamer 1.0 streaming media framework "ugly" plug-ins
Name: gstreamer1-plugins-ugly
-Version: 1.0.2
-Release: 2%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -23,7 +23,6 @@
BuildRequires: twolame-devel
BuildRequires: x264-devel >= 0.0.0-0.28
BuildRequires: opencore-amr-devel
-BuildRequires: PyXML
%description
GStreamer is a streaming media framework, based on graphs of elements which
@@ -102,6 +101,13 @@
%changelog
+* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.0.5-1
+- New upstream release 1.0.5
+- Drop no longer needed PyXML BuildRequires (rf#2572)
+
+* Sun Jan 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.2-3
+- Rebuilt for FFmpeg/x264
+
* Fri Nov 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.2-2
- Rebuilt for x264
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-plugins-ugly/F-18/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 28 Oct 2012 16:13:19 -0000 1.3
+++ sources 2 Mar 2013 11:07:52 -0000 1.4
@@ -1 +1 @@
-c72d307b37742d2ba1efd4d04884f56b gst-plugins-ugly-1.0.2.tar.xz
+cbad8e473023ef19c01a2edb744cb94a gst-plugins-ugly-1.0.5.tar.xz
11 years, 1 month
rpms/gstreamer1-plugins-ugly/devel .cvsignore, 1.4, 1.5 gstreamer1-plugins-ugly.spec, 1.5, 1.6 sources, 1.4, 1.5
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer1-plugins-ugly/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23667
Modified Files:
.cvsignore gstreamer1-plugins-ugly.spec sources
Log Message:
* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.0.5-1
- New upstream release 1.0.5
- Drop no longer needed PyXML BuildRequires (rf#2572)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-plugins-ugly/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 28 Oct 2012 16:12:54 -0000 1.4
+++ .cvsignore 2 Mar 2013 11:03:50 -0000 1.5
@@ -1 +1 @@
-gst-plugins-ugly-1.0.2.tar.xz
+gst-plugins-ugly-1.0.5.tar.xz
Index: gstreamer1-plugins-ugly.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-plugins-ugly/devel/gstreamer1-plugins-ugly.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gstreamer1-plugins-ugly.spec 20 Jan 2013 22:09:18 -0000 1.5
+++ gstreamer1-plugins-ugly.spec 2 Mar 2013 11:03:50 -0000 1.6
@@ -1,7 +1,7 @@
Summary: GStreamer 1.0 streaming media framework "ugly" plug-ins
Name: gstreamer1-plugins-ugly
-Version: 1.0.2
-Release: 3%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -23,7 +23,6 @@
BuildRequires: twolame-devel
BuildRequires: x264-devel >= 0.0.0-0.28
BuildRequires: opencore-amr-devel
-BuildRequires: PyXML
%description
GStreamer is a streaming media framework, based on graphs of elements which
@@ -102,6 +101,10 @@
%changelog
+* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.0.5-1
+- New upstream release 1.0.5
+- Drop no longer needed PyXML BuildRequires (rf#2572)
+
* Sun Jan 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.2-3
- Rebuilt for FFmpeg/x264
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-plugins-ugly/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 28 Oct 2012 16:12:54 -0000 1.4
+++ sources 2 Mar 2013 11:03:51 -0000 1.5
@@ -1 +1 @@
-c72d307b37742d2ba1efd4d04884f56b gst-plugins-ugly-1.0.2.tar.xz
+cbad8e473023ef19c01a2edb744cb94a gst-plugins-ugly-1.0.5.tar.xz
11 years, 1 month
rpms/gstreamer-plugins-ugly/devel gstreamer-plugins-ugly.spec, 1.52, 1.53
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-ugly/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23587
Modified Files:
gstreamer-plugins-ugly.spec
Log Message:
* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.19-10
- Drop no longer needed PyXML BuildRequires (rf#2572)
Index: gstreamer-plugins-ugly.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-ugly/devel/gstreamer-plugins-ugly.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gstreamer-plugins-ugly.spec 2 Mar 2013 10:50:24 -0000 1.52
+++ gstreamer-plugins-ugly.spec 2 Mar 2013 11:03:47 -0000 1.53
@@ -11,7 +11,7 @@
Summary: GStreamer streaming media framework "ugly" plug-ins
Name: gstreamer-plugins-ugly
Version: 0.10.19
-Release: 9%{?dist}
+Release: 10%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -38,7 +38,6 @@
BuildRequires: twolame-devel
BuildRequires: x264-devel >= 0.0.0-0.28
BuildRequires: opencore-amr-devel
-BuildRequires: PyXML
Provides: gstreamer-sid = %{version}-%{release}
Provides: gstreamer-lame = %{version}-%{release}
@@ -129,6 +128,9 @@
%changelog
+* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.19-10
+- Drop no longer needed PyXML BuildRequires (rf#2572)
+
* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.19-9
- Add upstream patch to fix building with latest libcdio (rf#2697)
11 years, 1 month
rpms/gstreamer-plugins-ugly/devel 0001-new-libcdio.patch,NONE,1.1
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-ugly/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23107
Added Files:
0001-new-libcdio.patch
Log Message:
* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.19-9
- Add upstream patch to fix building with latest libcdio (rf#2697)
0001-new-libcdio.patch:
gstcdio.c | 35 ++++++++++++++++++++++++++++-------
gstcdio.h | 16 ++++++++++++++++
gstcdiocddasrc.c | 20 +++++++++++++++++++-
3 files changed, 63 insertions(+), 8 deletions(-)
--- NEW FILE 0001-new-libcdio.patch ---
>From 6700410efb1786e5a40f45515574a1bf713ba011 Mon Sep 17 00:00:00 2001
From: Leon Merten Lohse <leon(a)green-side.de>
Date: Thu, 03 May 2012 22:50:30 +0000
Subject: cdio: compensate for libcdio's recent cd-text api changes
https://bugzilla.gnome.org/show_bug.cgi?id=675112
---
diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c
index 8940112..7b59030 100644
--- a/ext/cdio/gstcdio.c
+++ b/ext/cdio/gstcdio.c
@@ -30,12 +30,16 @@
GST_DEBUG_CATEGORY (gst_cdio_debug);
void
-gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
+gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track,
cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags)
{
const gchar *txt;
+#if LIBCDIO_VERSION_NUM > 83
+ txt = cdtext_get_const (cdtext, field, track);
+#else
txt = cdtext_get_const (field, cdtext);
+#endif
if (txt == NULL || *txt == '\0') {
GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag);
return;
@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
}
GstTagList *
+#if LIBCDIO_VERSION_NUM > 83
+gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track)
+{
+ GstTagList *tags = NULL;
+
+#else
gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track)
{
GstTagList *tags = NULL;
@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track)
GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track);
return NULL;
}
+#endif
- gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags);
- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags);
+ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER,
+ GST_TAG_ARTIST, &tags);
+ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE,
+ &tags);
return tags;
}
void
+#if LIBCDIO_VERSION_NUM > 83
+gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t,
+ GstTagList * tags)
+{
+#else
gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags)
{
cdtext_t *t;
@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags)
GST_DEBUG_OBJECT (src, "no CD-TEXT for album");
return;
}
+#endif
- /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */
- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags);
- gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags);
-
+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER,
+ GST_TAG_ALBUM_ARTIST, &tags);
+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM,
+ &tags);
+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE,
+ &tags);
GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags);
}
diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h
index ef31ed0..c6da580 100644
--- a/ext/cdio/gstcdio.h
+++ b/ext/cdio/gstcdio.h
@@ -24,22 +24,38 @@
#include <gst/gst.h>
#include <cdio/cdio.h>
#include <cdio/cdtext.h>
+#include <cdio/version.h>
+
+#if LIBCDIO_VERSION_NUM <= 83
+ #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER
+ #define CDTEXT_FIELD_GENRE CDTEXT_GENRE
+ #define CDTEXT_FIELD_TITLE CDTEXT_TITLE
+#endif
GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug);
#define GST_CAT_DEFAULT gst_cdio_debug
void gst_cdio_add_cdtext_field (GstObject * src,
cdtext_t * cdtext,
+ track_t track,
cdtext_field_t field,
const gchar * gst_tag,
GstTagList ** p_tags);
GstTagList * gst_cdio_get_cdtext (GstObject * src,
+#if LIBCDIO_VERSION_NUM > 83
+ cdtext_t * t,
+#else
CdIo * cdio,
+#endif
track_t track);
void gst_cdio_add_cdtext_album_tags (GstObject * src,
+#if LIBCDIO_VERSION_NUM > 83
+ cdtext_t * t,
+#else
CdIo * cdio,
+#endif
GstTagList * tags);
#endif /* __GST_CDIO_H__ */
diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c
index f57e368..88cf0c3 100644
--- a/ext/cdio/gstcdiocddasrc.c
+++ b/ext/cdio/gstcdiocddasrc.c
@@ -218,6 +218,9 @@ gst_cdio_cdda_src_open (GstCddaBaseSrc * cddabasesrc, const gchar * device)
GstCdioCddaSrc *src;
discmode_t discmode;
gint first_track, num_tracks, i;
+#if LIBCDIO_VERSION_NUM > 83
+ cdtext_t *cdtext;
+#endif
src = GST_CDIO_CDDA_SRC (cddabasesrc);
@@ -244,8 +247,18 @@ gst_cdio_cdda_src_open (GstCddaBaseSrc * cddabasesrc, const gchar * device)
if (src->read_speed != -1)
cdio_set_speed (src->cdio, src->read_speed);
+#if LIBCDIO_VERSION_NUM > 83
+ cdtext = cdio_get_cdtext (src->cdio);
+
+ if (NULL == cdtext)
+ GST_DEBUG_OBJECT (src, "no CD-TEXT on disc");
+ else
+ gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext,
+ cddabasesrc->tags);
+#else
gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio,
cddabasesrc->tags);
+#endif
GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track);
@@ -262,8 +275,14 @@ gst_cdio_cdda_src_open (GstCddaBaseSrc * cddabasesrc, const gchar * device)
* the right thing here (for cddb id calculations etc. as well) */
track.start = cdio_get_track_lsn (src->cdio, i + first_track);
track.end = track.start + len_sectors - 1; /* -1? */
+#if LIBCDIO_VERSION_NUM > 83
+ if (NULL != cdtext)
+ track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext,
+ i + first_track);
+#else
track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio,
i + first_track);
+#endif
gst_cdda_base_src_add_track (GST_CDDA_BASE_SRC (src), &track);
}
--
cgit v0.9.0.2-2-gbebe
11 years, 1 month
rpms/gstreamer-plugins-ugly/devel gstreamer-plugins-ugly.spec, 1.51, 1.52
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-ugly/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23048
Modified Files:
gstreamer-plugins-ugly.spec
Log Message:
* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.19-9
- Add upstream patch to fix building with latest libcdio (rf#2697)
Index: gstreamer-plugins-ugly.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-ugly/devel/gstreamer-plugins-ugly.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gstreamer-plugins-ugly.spec 28 Feb 2013 23:34:40 -0000 1.51
+++ gstreamer-plugins-ugly.spec 2 Mar 2013 10:50:24 -0000 1.52
@@ -11,11 +11,12 @@
Summary: GStreamer streaming media framework "ugly" plug-ins
Name: gstreamer-plugins-ugly
Version: 0.10.19
-Release: 8%{?dist}
+Release: 9%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
Source: http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{...
+Patch1: 0001-new-libcdio.patch
Requires: %{gstreamer} >= %{gst_minver}
BuildRequires: %{gstreamer}-devel >= %{gst_minver}
BuildRequires: %{gstreamer}-plugins-base-devel >= %{gstpb_minver}
@@ -33,9 +34,7 @@
BuildRequires: libmad-devel >= 0.15.0
BuildRequires: mpeg2dec-devel >= 0.4.0
BuildRequires: orc-devel >= 0.4.5
-%if 0%{?fedora} < 19
BuildRequires: libcdio-devel >= 0.82
-%endif
BuildRequires: twolame-devel
BuildRequires: x264-devel >= 0.0.0-0.28
BuildRequires: opencore-amr-devel
@@ -78,6 +77,7 @@
%prep
%setup -q -n gst-plugins-ugly-%{version}
+%patch1 -p1
%build
@@ -99,7 +99,6 @@
%files -f gst-plugins-ugly-%{majorminor}.lang
-%defattr(-,root,root,-)
%doc AUTHORS COPYING README REQUIREMENTS
%{_datadir}/gstreamer-%{majorminor}
# Plugins without external dependencies
@@ -114,9 +113,7 @@
%{_libdir}/gstreamer-%{majorminor}/libgsta52dec.so
%{_libdir}/gstreamer-%{majorminor}/libgstamrnb.so
%{_libdir}/gstreamer-%{majorminor}/libgstamrwbdec.so
-%if 0%{?fedora} < 19
%{_libdir}/gstreamer-%{majorminor}/libgstcdio.so
-%endif
%{_libdir}/gstreamer-%{majorminor}/libgstdvdread.so
%{_libdir}/gstreamer-%{majorminor}/libgstlame.so
%{_libdir}/gstreamer-%{majorminor}/libgstmad.so
@@ -128,11 +125,13 @@
%{_libdir}/gstreamer-%{majorminor}/libgstx264.so
%files devel-docs
-%defattr(-,root,root,-)
%doc %{_datadir}/gtk-doc/html/gst-plugins-ugly-plugins-0.10
%changelog
+* Sat Mar 2 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.19-9
+- Add upstream patch to fix building with latest libcdio (rf#2697)
+
* Thu Feb 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.19-8
- Disable libcdio for now
11 years, 1 month
rpms/staging-kmod-addons/F-18 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 staging-kmod-addons.spec, 1.11, 1.12
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod-addons/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17466
Modified Files:
.cvsignore sources staging-kmod-addons.spec
Log Message:
* Fri Mar 01 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.8.1-1
- Update to 3.8.1 and enable a few more drivers
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-18/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 14 Jan 2013 20:16:44 -0000 1.9
+++ .cvsignore 1 Mar 2013 22:13:24 -0000 1.10
@@ -1 +1 @@
-linux-staging-3.7.2.tar.bz2
+linux-staging-3.8.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-18/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 14 Jan 2013 20:16:44 -0000 1.9
+++ sources 1 Mar 2013 22:13:24 -0000 1.10
@@ -1 +1 @@
-d1fba18cf7fcc33e5a75068514b1eaa7 linux-staging-3.7.2.tar.bz2
+d2d3eb506fa90d697949caba381b837f linux-staging-3.8.1.tar.bz2
Index: staging-kmod-addons.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-18/staging-kmod-addons.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- staging-kmod-addons.spec 14 Jan 2013 20:16:44 -0000 1.11
+++ staging-kmod-addons.spec 1 Mar 2013 22:13:24 -0000 1.12
@@ -1,12 +1,12 @@
# drivers that we ship; to be synced with staging-kmod.spec
-%global stgdrvs ASUS_OLED BCM_WIMAX EASYCAP ECHO EPL ET131X FB_UDL FB_XGI FT1000_USB HECI IDE_PHISON LINE6_USB RTS_PSTOR RAMZSWAP R8187SE RTL8192SU RTL8192E RTL8192U RTS5139 SLICOSS SOLO6X10 SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_ENESTORAGE USB_WPAN_HCD USBIP_CORE W35UND PRISM2_USB VT6655 VT6656 ZCACHE ZRAM ZSMALLOC
+%global stgdrvs ASUS_OLED BCM_WIMAX CSR_WIFI CXT1E1 DGRP ECHO ET131X FB_XGI FT1000 IDE_PHISON LINE6_USB NET_VENDOR_SILICOM PRISM2_USB R8187SE RTL8192E RTL8192U RTS5139 SB105X SBE_2T3E3 SLICOSS SOLO6X10 SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 TRANZPORT USB_ENESTORAGE USB_SERIAL_QUATECH2 USB_WPAN_HCD USBIP_CORE VT6655 VT6656 WIMAX_GDM72XX WLAGS49_H25 W35UND WLAGS49_H2 ZCACHE ZRAM ZSMALLOC
# makes handling for rc kernels a whole lot easier:
#global prever rc8
Name: staging-kmod-addons
-Version: 3.7.2
+Version: 3.8.1
Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
Summary: Documentation and shared parts for the kmod-staging packages
@@ -139,6 +139,9 @@
%changelog
+* Fri Mar 01 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.8.1-1
+- Update to 3.8.1 and enable a few more drivers
+
* Mon Jan 14 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.7.2-1
- Update to 3.7.2
- work around missing usbip_bind_driver.8, which is referenced from Makefile.am
11 years, 1 month