Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	faad2.spec
@@ -1,23 +1,31 @@ -Name: faad2 +# norootforbuild + +%define name faad2 +%define version 2.6.1 +%define release 1 +%define major 0 +%define lib libfaad2 +%define libname %{lib}_%{major} + +Name: %{name} +Version: %{version} +Release: %{release} Summary: C library and frontend for decoding MPEG2/4 AAC Summary(de): C Bibliothek und Frontend zum Decodieren von MPEG2/4 AAC -Version: 2.5 -Release: 1 -License: GPL2 -Group: Applications/Multimedia +License: GPL v2 or later +Group: Productivity/Multimedia/Video/Editors and Convertors URL: http://www.audiocoding.com/ -Source0: faad2-2.5.tar.bz2 +Source0: faad2-2.6.1.tar.bz2 -Patch0: faad2-remove-bmp.patch -Patch1: faad2-libmp4ff.patch +Patch0: faad2-libmp4ff.patch BuildRoot: %{_tmppath}/buildroot-%{name}-%{version} +Requires: %{libname} = %{version}-%{release} Requires: libmp4v2 BuildRequires: libmp4v2-devel BuildRequires: glibc-devel -%if %suse_version <= 1020 +BuildRequires: libogg-devel BuildRequires: xmms-devel -%endif BuildRequires: id3lib-devel BuildRequires: gcc-c++ BuildRequires: SDL-devel @@ -27,7 +35,8 @@ BuildRequires: gtk BuildRequires: gtk-devel %endif -# Packmandepends: libmp4v2 +Obsoletes: faad2-drm +Provides: faad2-drm %description FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely @@ -37,29 +46,43 @@ FAAD 2 ist ein LC, MAIN und LTP profile, MPEG2 und MPEG-4 AAC Decoder. -%package devel +%package -n %{libname} +Group: System/Libraries +Summary: Shared library part of faad2 +Summary(de): Bibliotheken zu faad2 +Requires: libmp4v2 +Provides: %{lib} = %{version}-%{release} + +%description -n %{libname} +Shared library part of faad2 + +%description -n %{libname} -l de +Bibliotheken zu faad2 + +%package -n %{lib}-devel Summary: Development files of the FAAD 2 AAC decoder. Summary(de): Entwicklerdateien des FAAD 2 AAC Dekoders. -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Group: Development/Libraries/C and C++ +Requires: %{libname} = %{version}-%{release} Requires: libmp4v2-devel -# Packmandepends: faad2 libmp4v2-devel +Obsoletes: faad2-devel +Provides: faad2-devel +Obsoletes: faad2-drm-devel +Provides: faad2-drm-devel -%description devel +%description -n %{lib}-devel Header files and development documentation for libfaad. -%description -l de devel +%description -n %{lib}-devel -l de Header-Dateien und Entwicklerdokumtation zur libfaad. -%if %suse_version <= 1020 %package xmms-plugin Summary: faad2 Xmms input plugin Summary(de): faad2 Xmms input plugin Group: Productivity/Multimedia/Sound/Players -Requires: %{name} = %{version}-%{release} +Requires: %{libname} = %{version}-%{release} Requires: xmms >= 1.2.8 -# Packmandepends: faad2 xmms %description xmms-plugin The plugin read aac files with and without ID3tag(version 2.x), AAC files @@ -67,25 +90,21 @@ %description -l de xmms-plugin Das plugin liest AAC Dateien für xmms. -%endif + +%debug_package %prep %setup -qn faad2 -%patch0 -p1 -%patch1 +%patch0 %build export CFLAGS="$RPM_OPT_FLAGS" %{__mkdir_p} plugins/bmp autoreconf -vif -%if %suse_version <= 1020 %suse_update_libdir plugins/xmms/src/Makefile.am -%configure --with-xmms -%else -%configure -%endif +%configure --with-xmms --with-drm -%__make +%{__make} %{?jobs:-j%{jobs}} %install [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} @@ -106,20 +125,21 @@ %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_bindir}/* -%{_libdir}/.so -%files devel +%files -n %{libname} +%defattr(-,root,root) +%{_libdir}/.so. + +%files -n %{lib}-devel %defattr(-, root, root) -%{_libdir}/.a -%{_libdir}/.la +%{_libdir}/.a +%{_libdir}/.so %{_includedir}/ -%if %suse_version <= 1020 %files xmms-plugin %defattr(-, root, root) %doc plugins/xmms/README %{_libdir}/xmms/Input/libmp4* -%endif %changelog * Sun Sep 30 2007 Carsten Schoene <cs@linux-administrator.com>
[-] [+]	Changed	faad2-libmp4ff.patch ^
@@ -1,9 +1,9 @@ ---- common/mp4ff/Makefile.am 2006-05-07 20:09:00.000000000 +0200 -+++ common/mp4ff/Makefile.am 2007-02-24 13:18:46.000000000 +0100 +--- common/mp4ff/Makefile.am.orig 2006-05-07 20:09:00.000000000 +0200 ++++ common/mp4ff/Makefile.am 2008-07-05 14:56:14.000000000 +0200 @@ -1,4 +1,5 @@ --noinst_LTLIBRARIES = libmp4ff.la -+#noinst_LTLIBRARIES = libmp4ff.la -+lib_LTLIBRARIES = libmp4ff.la - - libmp4ff_la_CFLAGS = -DUSE_TAGGING=1 - +-noinst_LTLIBRARIES = libmp4ff.la ++#noinst_LTLIBRARIES = libmp4ff.la ++lib_LTLIBRARIES = libmp4ff.la + + libmp4ff_la_CFLAGS = -DUSE_TAGGING=1 +
[-] [+]	Deleted	faad2-remove-bmp.patch ^
@@ -1,76 +0,0 @@ -diff -ur faad2.orig/configure.in faad2/configure.in ---- faad2.orig/configure.in 2006-08-13 16:13:31.000000000 +0200 -+++ faad2/configure.in 2006-08-14 12:03:07.000000000 +0200 -@@ -29,9 +29,6 @@ - AC_ARG_WITH(xmms,[ --with-xmms compile XMMS-1 plugin], - WITHXMMS=$withval, WITHXMMS=no) - --AC_ARG_WITH(bmp,[ --with-bmp compile beep media player plugin], -- [WITHBMP=$withval;WITHXMMS=$withval], [WITHBMP=no]) -- - AC_ARG_WITH(drm,[ --with-drm compile libfaad with DRM support], - WITHDRM=$withval, WITHDRM=no) - -@@ -114,12 +111,6 @@ - AM_CONDITIONAL(HAVE_XMMS, false) - fi - --if test x$WITHBMP = xyes; then -- AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built]) -- AM_CONDITIONAL([HAVE_XMMS], true) -- AM_CONDITIONAL([HAVE_BMP], true) --fi -- - if test x$WITHDRM = xyes; then - AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)]) - AC_DEFINE(DRM_PS, 1, [Define if you want support for Digital Radio Mondiale (DRM) parametric stereo]) -diff -ur faad2.orig/plugins/Makefile.am faad2/plugins/Makefile.am ---- faad2.orig/plugins/Makefile.am 2006-08-07 20:47:45.000000000 +0200 -+++ faad2/plugins/Makefile.am 2006-08-14 11:35:44.000000000 +0200 -@@ -1,17 +1,13 @@ --if HAVE_MPEG4IP_PLUG --if HAVE_XMMS --SUBDIRS = xmms mpeg4ip --else --SUBDIRS = mpeg4ip --endif #HAVE_XMMS --else --if HAVE_XMMS --SUBDIRS = xmms --else --if HAVE_BMP --SUBDIRS = bmp --else --SUBDIRS = --endif #HAVE_BMP --endif #HAVE_XMMS --endif #HAVE_MPEG4IP_PLUG -+if HAVE_MPEG4IP_PLUG -+if HAVE_XMMS -+SUBDIRS = xmms mpeg4ip -+else -+SUBDIRS = mpeg4ip -+endif #HAVE_XMMS -+else -+if HAVE_XMMS -+SUBDIRS = xmms -+else -+SUBDIRS = -+endif #HAVE_XMMS -+endif #HAVE_MPEG4IP_PLUG -diff -ur faad2.orig/plugins/xmms/src/Makefile.am faad2/plugins/xmms/src/Makefile.am ---- faad2.orig/plugins/xmms/src/Makefile.am 2006-08-07 20:47:45.000000000 +0200 -+++ faad2/plugins/xmms/src/Makefile.am 2006-08-14 12:06:15.000000000 +0200 -@@ -1,12 +1,6 @@ --if HAVE_BMP --libdir=$(shell pkg-config --variable=input-plugin-dir bmp) --local_CFLAGS=$(shell pkg-config --cflags bmp) --local_LDFLAGS=$(shell pkg-config --libs bmp) --else - local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall - local_LDFLAGS=`$(XMMS_CONFIG) --libs` - libdir = `$(XMMS_CONFIG) --input-plugin-dir` --endif #HAVE_BMP - lib_LTLIBRARIES = libmp4.la - - libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
	Changed	faad2-2.6.1.tar.bz2 ^