--- a/ChangeLog Fri Aug 21 16:19:14 2009 +0000
+++ b/ChangeLog Fri Aug 21 18:49:31 2009 +0000
@@ -4,6 +4,8 @@
* encumbered/SFEdvdauthor.spec: update to 0.6.14
* SFEsdl-gfx.spec: update to 2.0.19
* encumbered/SFElibmad.spec: multiarch support
+ * SFElibmp4v2.spec: initial version
+ * encumbered/SFEfaad2.spec: multiarch support
2009-08-13 Matt Lewandowsky <[email protected]>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFElibmp4v2.spec Fri Aug 21 18:49:31 2009 +0000
@@ -0,0 +1,81 @@
+#
+# spec file for package SFElibmp4v2
+#
+# includes module(s): libmp4v2
+#
+%include Solaris.inc
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use libmp4v2_64 = libmp4v2.spec
+%endif
+
+%include base.inc
+%use libmp4v2 = libmp4v2.spec
+
+Name: SFElibmp4v2
+Summary: %{libmp4v2.summary}
+Version: %{libmp4v2.version}
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%prep
+rm -rf %name-%version
+mkdir %name-%version
+%ifarch amd64 sparcv9
+mkdir %name-%version/%_arch64
+%libmp4v2_64.prep -d %name-%version/%_arch64
+%endif
+
+mkdir %name-%version/%{base_arch}
+%libmp4v2.prep -d %name-%version/%{base_arch}
+
+%build
+%ifarch amd64 sparcv9
+%libmp4v2_64.build -d %name-%version/%_arch64
+%endif
+
+%libmp4v2.build -d %name-%version/%{base_arch}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%ifarch amd64 sparcv9
+%libmp4v2_64.install -d %name-%version/%_arch64
+%endif
+
+%libmp4v2.install -d %name-%version/%{base_arch}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%{_libdir}/%{_arch64}/lib*.so*
+%endif
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, bin) %{_mandir}
+%dir %attr (0755, root, bin) %{_mandir}/man1
+%{_mandir}/man1/*
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+
+%changelog
+* Fri Aug 21 2009 - Milan Jurik
+- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/faad2.spec Fri Aug 21 18:49:31 2009 +0000
@@ -0,0 +1,59 @@
+#
+# spec file for package faad2
+#
+# includes module(s): faad2
+#
+
+Name: faad2
+Summary: A high-quality MPEG audio decoder
+Version: 2.7
+Source: %{sf_download}/faac/faad2-%{version}.tar.gz
+Patch4: faad-04-wall.diff
+Patch6: faad-06-iquote.diff
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%prep
+%setup -q -n %{name}-%{version}
+%patch4 -p1
+%patch6 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+export CFLAGS="%optflags"
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
+export MSGFMT="/usr/bin/msgfmt"
+%if %cc_is_gcc
+%else
+export CXX="${CXX} -norunpath"
+%endif
+%ifarch sparc
+export CXXFLAGS="-norunpath -xO5 -xlibmil -xlibmopt -features=tmplife"
+%else
+export CXXFLAGS="-norunpath -xO3 -xlibmil -xlibmopt -features=tmplife"
+%endif
+
+autoreconf --install
+./configure --prefix=%{_prefix} --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir} \
+ --with-mpeg4ip \
+ --with-drm \
+ --enable-shared \
+ --disable-static
+
+make -j$CPUS
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%changelog
+* Fri Aug 21 2009 - Milan Jurik
+- Initial base spec file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/libmp4v2.spec Fri Aug 21 18:49:31 2009 +0000
@@ -0,0 +1,46 @@
+#
+# spec file for package libmp4v2
+#
+# includes module(s): libmp4v2
+#
+
+%define src_ver 1.9.1
+%define src_name mp4v2
+%define src_url http://mp4v2.googlecode.com/files
+
+Name: libmp4v2
+Summary: The MP4v2 library provides an API to create and modify mp4 files as defined by ISO-IEC:14496-1:2001 MPEG-4 Systems.
+Version: %{src_ver}
+Source: %{src_url}/%{src_name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%prep
+%setup -q -n %{src_name}-%{version}
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+
+./configure --prefix=%{_prefix} --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir} \
+ --enable-shared \
+ --disable-static
+
+make -j$CPUS
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%changelog
+* Fri Aug 21 2009 - Milan Jurik
+- Initial base spec file
--- a/encumbered/SFEfaad2.spec Fri Aug 21 16:19:14 2009 +0000
+++ b/encumbered/SFEfaad2.spec Fri Aug 21 18:49:31 2009 +0000
@@ -4,18 +4,19 @@
# includes module(s): faad2
#
%include Solaris.inc
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use faad2_64 = faad2.spec
+%endif
+
+%include base.inc
+%use faad2 = faad2.spec
Name: SFEfaad2
-Summary: faad2 - a high-quality MPEG audio decoder
+Summary: %{faad2.summary}
Group: libraries/multimedia
-Version: 2.6.1
-Source: %{sf_download}/faac/faad2-%{version}.tar.gz
+Version: %{faad2.version}
URL: http://www.audiocoding.com/
-#Patch1: faad-01-makefile.diff
-Patch2: faad-02-inline.diff
-#Patch3: faad-03-largefiles.diff
-Patch4: faad-04-wall.diff
-#Patch5: faad-05-strchr.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
@@ -29,47 +30,31 @@
Requires: %name
%prep
-%setup -q -n faad2
-#%patch1 -p1
-%patch2 -p1
-#%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
+rm -rf %name-%version
+mkdir %name-%version
+%ifarch amd64 sparcv9
+mkdir %name-%version/%_arch64
+%faad2_64.prep -d %name-%version/%_arch64
+%endif
+
+mkdir %name-%version/%{base_arch}
+%faad2.prep -d %name-%version/%{base_arch}
+
%build
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
- CPUS=1
-fi
-# Compiler bug forces us back to -xO2 for the moment
-#export CFLAGS="`echo "%optflags" | sed 's/-xO4/-xO2/'`"
-export CFLAGS="%optflags"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export MSGFMT="/usr/bin/msgfmt"
-%if %cc_is_gcc
-%else
-export CXX="${CXX} -norunpath"
-%endif
-%ifarch sparc
-export CXXFLAGS="-norunpath -xO5 -xlibmil -xlibmopt -features=tmplife"
-%else
-export CXXFLAGS="-norunpath -xO3 -xlibmil -xlibmopt -features=tmplife"
+%ifarch amd64 sparcv9
+%faad2_64.build -d %name-%version/%_arch64
%endif
-autoreconf --install
-./configure --prefix=%{_prefix} --mandir=%{_mandir} \
- --libdir=%{_libdir} \
- --libexecdir=%{_libexecdir} \
- --sysconfdir=%{_sysconfdir} \
- --with-mp4v2 \
- --enable-shared \
- --disable-static
-
-make -j$CPUS
+%faad2.build -d %name-%version/%{base_arch}
%install
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a
+rm -rf $RPM_BUILD_ROOT
+%ifarch amd64 sparcv9
+%faad2_64.install -d %name-%version/%_arch64
+%endif
+
+%faad2.install -d %name-%version/%{base_arch}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -80,6 +65,10 @@
%{_bindir}/*
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, bin) %{_mandir}
+%dir %attr (0755, root, bin) %{_mandir}/manm
+%{_mandir}/manm/faad.man
%files devel
%defattr (-, root, bin)
@@ -87,6 +76,8 @@
%{_includedir}/*
%changelog
+* Fri Aug 21 2009 - Milan Jurik
+- multiarch support
* Fri May 23 2008 - michal.bielicki <at> voiceworks.pl
- id3 is now part of nevada so dependencies should point to SUNWid3 and SUNWid3-devel, thanks to Giles Dauphin for the fix
* Mon Nov 5 2007 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/faad-06-iquote.diff Fri Aug 21 18:49:31 2009 +0000
@@ -0,0 +1,10 @@
+--- faad2-2.7/libfaad/Makefile.am Thu Feb 5 01:51:03 2009
++++ faad2-2.7-patch/libfaad/Makefile.am Fri Aug 21 19:46:25 2009
+@@ -1,6 +1,6 @@
+ lib_LTLIBRARIES = libfaad.la
+
+-AM_CFLAGS = -iquote $(top_srcdir)/include
++AM_CFLAGS = -I $(top_srcdir)/include
+ include_HEADERS = $(top_srcdir)/include/faad.h \
+ $(top_srcdir)/include/neaacdec.h
+