[packages/gmerlin] - updated to 1.2.0 - fix building with latest libcdio
baggins
baggins at pld-linux.org
Thu Feb 14 14:00:14 CET 2013
commit 734cddcdf4b2b7cad8178f2a964e224fe5701478
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Feb 14 13:59:49 2013 +0100
- updated to 1.2.0
- fix building with latest libcdio
cdio.patch | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++
gmerlin-link.patch | 2 +-
gmerlin.spec | 14 +++++---
3 files changed, 113 insertions(+), 5 deletions(-)
---
diff --git a/gmerlin.spec b/gmerlin.spec
index 15e6caf..af7df92 100644
--- a/gmerlin.spec
+++ b/gmerlin.spec
@@ -8,15 +8,16 @@
Summary: Set of multimedia libraries builded with an application suite
Summary(pl.UTF-8): Zbiór bibliotek multimedialnych wraz z aplikacjami
Name: gmerlin
-Version: 1.0.0
-Release: 6
+Version: 1.2.0
+Release: 1
License: GPL v2+
Group: Libraries
Source0: http://downloads.sourceforge.net/gmerlin/%{name}-%{version}.tar.gz
-# Source0-md5: 60d3c5081c8685ee7bc1afdfac8f6dc6
+# Source0-md5: 2f2a0880e738e71486f04c929ba067f4
Patch0: %{name}-link.patch
Patch1: %{name}-icons.patch
Patch2: %{name}-info.patch
+Patch3: cdio.patch
URL: http://gmerlin.sourceforge.net/
BuildRequires: OpenGL-devel
BuildRequires: alsa-lib-devel >= 1.0.0
@@ -25,7 +26,7 @@ BuildRequires: automake
%{?with_esd:BuildRequires: esound-devel >= 0.2.19}
BuildRequires: fontconfig-devel >= 2.2.3
BuildRequires: freetype-devel >= 2.4
-BuildRequires: gavl-devel >= 1.2.0
+BuildRequires: gavl-devel >= 1.4.0
BuildRequires: gettext-devel
# inotify interface
BuildRequires: glibc-devel >= 6:2.4
@@ -114,6 +115,7 @@ Statyczne biblioteki gmerlin.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# evil, sets CFLAGS basing on /proc/cpuinfo, overrides our optflags
# (--with-cpuflags=none disables using /proc/cpuinfo, but not overriding)
@@ -162,7 +164,10 @@ rm -rf $RPM_BUILD_ROOT
%if %{with v4l1}
%attr(755,root,root) %{_bindir}/camelot
%endif
+%attr(755,root,root) %{_bindir}/album2m3u
+%attr(755,root,root) %{_bindir}/album2pls
%attr(755,root,root) %{_bindir}/gmerlin
+%attr(755,root,root) %{_bindir}/gmerlin-record
%attr(755,root,root) %{_bindir}/gmerlin-video-thumbnailer
%attr(755,root,root) %{_bindir}/gmerlin_alsamixer
%attr(755,root,root) %{_bindir}/gmerlin_imgconvert
@@ -204,6 +209,7 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_docdir}/gmerlin/userguide
%{_infodir}/gmerlin.info*
%{_mandir}/man1/gmerlin.1*
+%{_mandir}/man1/gmerlin-record.1*
%{_mandir}/man1/gmerlin_play.1*
%{_mandir}/man1/gmerlin_remote.1*
%{_mandir}/man1/gmerlin_transcoder.1*
diff --git a/cdio.patch b/cdio.patch
new file mode 100644
index 0000000..75aba6c
--- /dev/null
+++ b/cdio.patch
@@ -0,0 +1,102 @@
+--- gmerlin-1.2.0/plugins/cdaudio/cdtext.c~ 2012-06-08 13:50:33.000000000 +0200
++++ gmerlin-1.2.0/plugins/cdaudio/cdtext.c 2013-02-14 13:44:55.726147599 +0100
+@@ -34,7 +34,7 @@
+ #include "cdaudio.h"
+
+ #define GET_FIELD(dst, key) \
+- field = cdtext_get_const(key, cdtext);
++ field = cdtext_get_const(cdtext, key, i+1);
+
+ #define GET_FIELD_DEFAULT(dst,key) \
+ field = cdtext_get_const(key, cdtext); \
+@@ -64,30 +64,26 @@
+
+ /* Get information for the whole disc */
+
+- cdtext = cdio_get_cdtext (cdio, 0);
++ cdtext = cdio_get_cdtext (cdio);
+
+ if(!cdtext)
+ return 0;
+
+- artist = cdtext_get_const(CDTEXT_PERFORMER, cdtext);
+- author = cdtext_get_const(CDTEXT_COMPOSER, cdtext); /* Composer overwrites songwriter */
++ artist = cdtext_get_const(cdtext, CDTEXT_FIELD_PERFORMER, 0);
++ author = cdtext_get_const(cdtext, CDTEXT_FIELD_COMPOSER, 0); /* Composer overwrites songwriter */
+
+ if(!author)
+- author = cdtext_get_const(CDTEXT_SONGWRITER, cdtext);
++ author = cdtext_get_const(cdtext, CDTEXT_FIELD_SONGWRITER, 0);
+
+- album = cdtext_get_const(CDTEXT_TITLE, cdtext);
+- genre = cdtext_get_const(CDTEXT_GENRE, cdtext);
+- comment = cdtext_get_const(CDTEXT_MESSAGE, cdtext);
++ album = cdtext_get_const(cdtext, CDTEXT_FIELD_TITLE, 0);
++ genre = cdtext_get_const(cdtext, CDTEXT_FIELD_GENRE, 0);
++ comment = cdtext_get_const(cdtext, CDTEXT_FIELD_MESSAGE, 0);
+
+ for(i = 0; i < idx->num_tracks; i++)
+ {
+ if(idx->tracks[i].is_audio)
+ {
+- cdtext = cdio_get_cdtext (cdio, i+1);
+- if(!cdtext)
+- return 0;
+-
+- GET_FIELD(title, CDTEXT_TITLE);
++ GET_FIELD(title, CDTEXT_FIELD_TITLE);
+
+ if(!title)
+ return 0;
+@@ -95,7 +91,7 @@
+ gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+ GAVL_META_TITLE, title);
+
+- if((field = cdtext_get_const(CDTEXT_PERFORMER, cdtext)))
++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_PERFORMER, i+1)))
+ gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+ GAVL_META_ARTIST, field);
+ else
+@@ -103,10 +99,10 @@
+ GAVL_META_ARTIST, artist);
+
+
+- if((field = cdtext_get_const(CDTEXT_COMPOSER, cdtext)))
++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_COMPOSER, i+1)))
+ gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+ GAVL_META_AUTHOR, field);
+- else if((field = cdtext_get_const(CDTEXT_SONGWRITER, cdtext)))
++ else if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_SONGWRITER, i+1)))
+ gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+ GAVL_META_AUTHOR, field);
+ else if(author)
+@@ -114,14 +110,14 @@
+ GAVL_META_AUTHOR, author);
+
+
+- if((field = cdtext_get_const(CDTEXT_GENRE, cdtext)))
++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_GENRE, i+1)))
+ gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+ GAVL_META_GENRE, field);
+ else
+ gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+ GAVL_META_GENRE, genre);
+
+- if((field = cdtext_get_const(CDTEXT_MESSAGE, cdtext)))
++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_MESSAGE, i+1)))
+ gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+ GAVL_META_COMMENT, field);
+ else
+--- gmerlin-1.2.0/plugins/cdaudio/cdparanoia.c~ 2012-06-08 13:50:33.000000000 +0200
++++ gmerlin-1.2.0/plugins/cdaudio/cdparanoia.c 2013-02-14 13:48:40.814940633 +0100
+@@ -28,8 +28,8 @@
+
+ #include "cdaudio.h"
+ #define DO_NOT_WANT_PARANOIA_COMPATIBILITY
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+
+ /*
+ * Ripping support
diff --git a/gmerlin-link.patch b/gmerlin-link.patch
index 5ae90fe..cd1f725 100644
--- a/gmerlin-link.patch
+++ b/gmerlin-link.patch
@@ -14,7 +14,7 @@
@@ -154,7 +154,7 @@
PKG_CHECK_MODULES(FREETYPE, freetype2 >= $FREETYPE_REQUIRED, , AC_MSG_ERROR("freetype2 not found"))
- ICONV_LIBS=
+ ICONV_LIBS=""
-AC_CHECK_LIB(iconv, libiconv_close, ICONV_LIBS="-liconv")
+AC_CHECK_FUNC([iconv_close], , [AC_CHECK_LIB(iconv, libiconv_close, ICONV_LIBS="-liconv")])
AC_SUBST(ICONV_LIBS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gmerlin.git/commitdiff/734cddcdf4b2b7cad8178f2a964e224fe5701478
More information about the pld-cvs-commit
mailing list