Author: qboosh Date: Wed Jul 27 18:28:39 2011 GMT Module: packages Tag: HEAD ---- Log message: - versioned BRs - pl - added ffmpeg-0.8 patch to fix build with ffmpeg 0.8 - added link patch to avoid linking with libiconv - moved utils from -devel to base
---- Files affected: packages/gmerlin-avdecoder: gmerlin-avdecoder.spec (1.4 -> 1.5) , gmerlin-avdecoder-ffmpeg-0.8.patch (NONE -> 1.1) (NEW), gmerlin-avdecoder-link.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gmerlin-avdecoder/gmerlin-avdecoder.spec diff -u packages/gmerlin-avdecoder/gmerlin-avdecoder.spec:1.4 packages/gmerlin-avdecoder/gmerlin-avdecoder.spec:1.5 --- packages/gmerlin-avdecoder/gmerlin-avdecoder.spec:1.4 Sun Jul 24 17:55:03 2011 +++ packages/gmerlin-avdecoder/gmerlin-avdecoder.spec Wed Jul 27 20:28:33 2011 @@ -1,45 +1,55 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_without apidocs # without doc -Summary: Multiformat decoding library +%bcond_without apidocs # without doc +%bcond_without smb # SMB support +# +Summary: Multiformat media decoding library +Summary(pl.UTF-8): Biblioteka dekodująca wiele formatów multimedialnych Name: gmerlin-avdecoder Version: 1.1.0 Release: 2 -License: GPL v2 +License: GPL v2+ Group: Libraries -Source0: http://dl.sourceforge.net/gmerlin/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/gmerlin/%{name}-%{version}.tar.gz # Source0-md5: c1ea663e9da631453eec4ac79138b6c5 Patch0: %{name}-cflags.patch +Patch1: %{name}-ffmpeg-0.8.patch +Patch2: %{name}-link.patch URL: http://gmerlin.sourceforge.net/avdec_frame.html -BuildRequires: a52dec-libs-devel +BuildRequires: a52dec-libs-devel >= 0.7.4 BuildRequires: autoconf >= 2.50 -BuildRequires: automake +BuildRequires: automake >= 1:1.8.5 %{?with_apidocs:BuildRequires: doxygen} -BuildRequires: faad2-devel -BuildRequires: ffmpeg-devel -BuildRequires: flac-devel -BuildRequires: gavl-devel -#BuildRequires: gmerlin-devel -BuildRequires: libcdio-devel -BuildRequires: libdts-devel +BuildRequires: faad2-devel >= 2.0 +BuildRequires: ffmpeg-devel >= 0.7 +BuildRequires: flac-devel >= 1.1.0 +BuildRequires: gavl-devel >= 1.2.0 +BuildRequires: gettext-devel +BuildRequires: gmerlin-devel >= 1.0.0 +BuildRequires: libcdio-devel >= 0.76 +BuildRequires: libdts-devel >= 0.0.2 #BuildRequires: libdvdread-devel >= 0.9.5 -BuildRequires: libmad-devel -BuildRequires: libmpcdec-devel -BuildRequires: libmpeg2-devel -BuildRequires: libpng-devel -BuildRequires: libtheora-devel -BuildRequires: libtiff-devel +BuildRequires: libmad-devel >= 0.15.0 +BuildRequires: libmpcdec-devel >= 1.1 +BuildRequires: libmpeg2-devel >= 0.4.0 +BuildRequires: libogg-devel >= 1.0 +BuildRequires: libpng-devel >= 1.2.2 +BuildRequires: libtheora-devel >= 1.0.0 +BuildRequires: libtiff-devel >= 3.5.0 BuildRequires: libtool BuildRequires: libvdpau-devel -BuildRequires: libvorbis-devel -BuildRequires: mjpegtools-devel -BuildRequires: openjpeg-devel -BuildRequires: pkgconfig >= 0.9.0 -BuildRequires: samba-devel -BuildRequires: schroedinger-devel -BuildRequires: speex-devel +BuildRequires: libvorbis-devel >= 1.0 +BuildRequires: mjpegtools-devel >= 1.9.0 +BuildRequires: openjpeg-devel >= 1.3 +BuildRequires: pkgconfig >= 1:0.9.0 +%{?with_smb:BuildRequires: libsmbclient-devel >= 3.0.0} +BuildRequires: schroedinger-devel >= 1.0.5 +BuildRequires: speex-devel >= 1.0.4 +BuildRequires: xorg-lib-libX11-devel >= 1.0.0 +BuildRequires: xorg-lib-libXext-devel BuildRequires: zlib-devel +Requires: gavl >= 1.2.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define specflags -fomit-frame-pointer -ffast-math @@ -50,30 +60,43 @@ codecs span a wide range of applications from consumer level (mp3, divx etc.) to high end production formats like 32 bit PCM and some professional uncompressed video codecs. -Using gmerlin_avdecoder in your playback for transcoding application -means rock solid media format support with an ever growing list of -supported codecs and formats + +%description -l pl.UTF-8 +Ogólnego przeznaczenia biblioteka dekodująca multimedia. Jest to jedna +z najbardziej kompletnych bibliotek tego typu. Obsługiwane formaty +obejmują wiele zastosowań od poziomu konsumenckiego (mp3, divx itp.) +do formatów wysokiej jakości produkcji, jak 32-bitowy PCM i różne +profesjonalne kodeki obrazu bez kompresji. %package devel -Summary: Header files for %{name} library +Summary: Header files for gmerlin_avdec library +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki gmerlin_avdec Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel -This package contains the header files, static libraries and -development documentation for %{name}. +Header files for gmerlin_avdec library. + +%description devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki gmerlin_avdec. %package static -Summary: Static %{name} library +Summary: Static gmerlin_avdec library +Summary(pl.UTF-8): Statyczna biblioteka gmerlin_avdec Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} %description static -Static %{name} library. +Static gmerlin_avdec library. + +%description static -l pl.UTF-8 +Statyczna biblioteka gmerlin_avdec. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %{__libtoolize} @@ -82,7 +105,7 @@ %{__autoheader} %{__automake} %configure \ - --enable-shared \ + %{!?with_smb:--disable-samba} \ --enable-static \ %{!?with_apidocs:--without-doxygen} \ --with-cpuflags=none @@ -94,7 +117,8 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -%{__rm} -r $RPM_BUILD_ROOT{%{_libdir}/*.la,%{_prefix}/share/doc/%{name}} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgmerlin_avdec.la +%{__rm} -r %{_prefix}/share/doc/%{name}/apiref %find_lang %{name} @@ -107,13 +131,14 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS NEWS README -%attr(755,root,root) %ghost %{_libdir}/libgmerlin_avdec.so.? +%attr(755,root,root) %{_bindir}/bgavdemux +%attr(755,root,root) %{_bindir}/bgavdump %attr(755,root,root) %{_libdir}/libgmerlin_avdec.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libgmerlin_avdec.so.1 %files devel %defattr(644,root,root,755) %{?with_apidocs:%doc doc/apiref} -%attr(755,root,root) %{_bindir}/bgavd* %attr(755,root,root) %{_libdir}/libgmerlin_avdec.so %{_includedir}/gmerlin %{_pkgconfigdir}/gmerlin_avdec.pc @@ -128,6 +153,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.5 2011/07/27 18:28:33 qboosh +- versioned BRs +- pl +- added ffmpeg-0.8 patch to fix build with ffmpeg 0.8 +- added link patch to avoid linking with libiconv +- moved utils from -devel to base + Revision 1.4 2011/07/24 15:55:03 arekm - release 2 ================================================================ Index: packages/gmerlin-avdecoder/gmerlin-avdecoder-ffmpeg-0.8.patch diff -u /dev/null packages/gmerlin-avdecoder/gmerlin-avdecoder-ffmpeg-0.8.patch:1.1 --- /dev/null Wed Jul 27 20:28:39 2011 +++ packages/gmerlin-avdecoder/gmerlin-avdecoder-ffmpeg-0.8.patch Wed Jul 27 20:28:33 2011 @@ -0,0 +1,89 @@ +--- gmerlin-avdecoder-1.1.0/lib/demux_ffmpeg.c.orig 2011-01-07 17:59:57.000000000 +0100 ++++ gmerlin-avdecoder-1.1.0/lib/demux_ffmpeg.c 2011-07-27 18:38:47.552019582 +0200 +@@ -583,7 +583,7 @@ + #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 29, 0) + register_protocol(&bgav_protocol); + #else +- av_register_protocol(&bgav_protocol); ++ av_register_protocol2(&bgav_protocol, sizeof(bgav_protocol)); + #endif + + #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 26, 0) +@@ -629,13 +629,13 @@ static int open_ffmpeg(bgav_demuxer_cont + { + switch(avfc->streams[i]->codec->codec_type) + { +- case CODEC_TYPE_AUDIO: ++ case AVMEDIA_TYPE_AUDIO: + init_audio_stream(ctx, avfc->streams[i], i); + break; +- case CODEC_TYPE_VIDEO: ++ case AVMEDIA_TYPE_VIDEO: + init_video_stream(ctx, avfc->streams[i], i); + break; +- case CODEC_TYPE_SUBTITLE: ++ case AVMEDIA_TYPE_SUBTITLE: + break; + default: + break; +@@ -654,16 +654,19 @@ static int open_ffmpeg(bgav_demuxer_cont + priv->avfc->iformat->long_name); + + /* Metadata */ +- if(avfc->title[0]) +- ctx->tt->cur->metadata.title = bgav_strdup(avfc->title); +- if(avfc->author[0]) +- ctx->tt->cur->metadata.author = bgav_strdup(avfc->author); +- if(avfc->copyright[0]) +- ctx->tt->cur->metadata.copyright = bgav_strdup(avfc->copyright); +- if(avfc->album[0]) +- ctx->tt->cur->metadata.album = bgav_strdup(avfc->album); +- if(avfc->genre[0]) +- ctx->tt->cur->metadata.genre = bgav_strdup(avfc->genre); ++ { ++ AVDictionaryEntry *ade; ++ if((ade = av_dict_get(avfc->metadata, "TITLE", NULL, 0)) != NULL) ++ ctx->tt->cur->metadata.title = bgav_strdup(ade->value); ++ if((ade = av_dict_get(avfc->metadata, "ARTIST", NULL, 0)) != NULL) ++ ctx->tt->cur->metadata.author = bgav_strdup(ade->value); ++ if((ade = av_dict_get(avfc->metadata, "COPYRIGHT", NULL, 0)) != NULL) ++ ctx->tt->cur->metadata.copyright = bgav_strdup(ade->value); ++ if((ade = av_dict_get(avfc->metadata, "ALBUM", NULL, 0)) != NULL) ++ ctx->tt->cur->metadata.album = bgav_strdup(ade->value); ++ if((ade = av_dict_get(avfc->metadata, "GENRE", NULL, 0)) != NULL) ++ ctx->tt->cur->metadata.genre = bgav_strdup(ade->value); ++ } + + return 1; + } +@@ -739,7 +742,7 @@ static int next_packet_ffmpeg(bgav_demux + s->data.video.palette_changed = 1; + } + +- if(pkt.flags&PKT_FLAG_KEY) ++ if(pkt.flags&AV_PKT_FLAG_KEY) + PACKET_SET_KEYFRAME(p); + bgav_stream_done_packet_write(s, p); + +--- gmerlin-avdecoder-1.1.0/lib/video_ffmpeg.c.orig 2011-01-07 17:59:57.000000000 +0100 ++++ gmerlin-avdecoder-1.1.0/lib/video_ffmpeg.c 2011-07-27 18:39:15.985353869 +0200 +@@ -836,7 +836,7 @@ static int init_ffmpeg(bgav_stream_t * s + if(s->action == BGAV_STREAM_PARSE) + return 1; + +- priv->ctx->codec_type = CODEC_TYPE_VIDEO; ++ priv->ctx->codec_type = AVMEDIA_TYPE_VIDEO; + + priv->ctx->bit_rate = 0; + +--- gmerlin-avdecoder-1.1.0/lib/Makefile.am.orig 2011-01-06 05:55:55.000000000 +0100 ++++ gmerlin-avdecoder-1.1.0/lib/Makefile.am 2011-07-27 18:44:12.105363783 +0200 +@@ -130,7 +130,7 @@ endif + + if HAVE_LIBAVFORMAT + avformat_cflags = @AVFORMAT_CFLAGS@ +-avformat_libs = @AVFORMAT_LIBS@ ++avformat_libs = @AVFORMAT_LIBS@ -lavutil + avformat_sources = demux_ffmpeg.c + else + avformat_cflags = ================================================================ Index: packages/gmerlin-avdecoder/gmerlin-avdecoder-link.patch diff -u /dev/null packages/gmerlin-avdecoder/gmerlin-avdecoder-link.patch:1.1 --- /dev/null Wed Jul 27 20:28:39 2011 +++ packages/gmerlin-avdecoder/gmerlin-avdecoder-link.patch Wed Jul 27 20:28:33 2011 @@ -0,0 +1,11 @@ +--- gmerlin-avdecoder-1.1.0/configure.ac.orig 2011-07-27 19:21:58.412106334 +0200 ++++ gmerlin-avdecoder-1.1.0/configure.ac 2011-07-27 19:38:51.748806931 +0200 +@@ -152,7 +152,7 @@ + AC_SUBST(GAVL_REQUIRED) + + 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) + + if test "x$os_win32" = "xyes"; then ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gmerlin-avdecoder/gmerlin-avdecoder.spec?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
