ref: 23379b57a2a748622f925ad5eebcfcc8c806e2a4
parent: 8cfe7d4f44a76d1430ceaa2d99e87aa0d3cb88cc
author: menno <menno>
date: Mon Nov 8 03:06:09 EST 2004
Updated linux compilation
--- a/configure.in
+++ b/configure.in
@@ -32,9 +32,6 @@
AC_ARG_WITH(drm,[ --with-drm compile libfaad with DRM support],
WITHDRM=$withval, WITHDRM=no)
-dnl AC_ARG_WITH(mp4v2,[ --with-mp4v2 compile libmp4v2],
-dnl WITHMP4V2=$withval, WITHMP4V2=no)
-
AC_ARG_WITH(mpeg4ip, [ --with-mpeg4ip compile mpeg4ip plugin],
WITHMPEG4IP=$withval, WITHMPEG4IP=no)
@@ -83,33 +80,6 @@
AC_CHECK_FUNCS(strsep)
-dnl MY_CHECK_TYPEDEF_FROM_INCLUDE([in_port_t temp],
-dnl [#include <sys/types.h>
-dnl #include <netinet/in.h>], [HAVE_IN_PORT_T])
-dnl MY_CHECK_TYPEDEF_FROM_INCLUDE([socklen_t temp],
-dnl [#include <sys/types.h>
-dnl #include <sys/socket.h>], HAVE_SOCKLEN_T)
-dnl MY_CHECK_TYPEDEF_FROM_INCLUDE([fpos_t foo; foo.__pos = 0;],
-dnl [#include <stdio.h>],
-dnl [HAVE_FPOS_T_POS])
-
-
-dnl AC_CHECK_PROG(external_mp4v2, mpeg4ip-config, yes, no)
-dnl AM_CONDITIONAL(WITH_MP4V2, false)
-
-dnl if test x$external_mp4v2 = xyes; then
-dnl AM_CONDITIONAL(HAVE_MPEG4IP, true)
-dnl MPEG4IP_PLAYER_PLUGIN_DIR=`mpeg4ip-config --player-plugin-dir`
-dnl AC_SUBST(MPEG4IP_PLAYER_PLUGIN_DIR)
-dnl AC_MSG_NOTICE([*** Building with external mp4v2 ***])
-dnl else
-dnl AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
-dnl AM_CONDITIONAL(HAVE_MPEG4IP, false)
-dnl if test x$WITHMP4V2 = xyes; then
-dnl AM_CONDITIONAL(WITH_MP4V2, true)
-dnl fi
-dnl fi
-
AC_CHECK_PROG(external_mp4v2, mpeg4ip-config, yes, no)
AM_CONDITIONAL(HAVE_MPEG4IP_PLUG, false)
if test x$WITHMPEG4IP = xyes; then
@@ -136,9 +106,6 @@
fi
AM_CONDITIONAL(HAVE_XMMS, true)
-dnl AC_MSG_NOTICE("xmms plugin requires libmp4v2 to be build")-dnl AM_CONDITIONAL(WITH_MP4V2, true)
-dnl AC_CONFIG_FILES(plugins/xmms/Makefile plugins/xmms/src/Makefile)
else
AC_MSG_NOTICE(no xmms build configured)
AM_CONDITIONAL(HAVE_XMMS, false)
@@ -146,6 +113,7 @@
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])
fi
AC_CONFIG_FILES(libfaad/Makefile)
@@ -154,7 +122,7 @@
AC_CONFIG_FILES(plugins/Makefile)
AC_CONFIG_FILES(plugins/xmms/Makefile)
AC_CONFIG_FILES(plugins/xmms/src/Makefile)
-dnl AC_CONFIG_FILES(plugins/mpeg4ip/Makefile)
+AC_CONFIG_FILES(plugins/mpeg4ip/Makefile)
AC_CONFIG_FILES(faad2.spec)
AC_CONFIG_FILES(frontend/Makefile)
AC_CONFIG_FILES(Makefile)
--- a/faad2.spec.in
+++ b/faad2.spec.in
@@ -1,3 +1,21 @@
+# this has been taken from http://www.hyperborea.org/software/dillo/dillo.spec
+#################################################################################
+# Identify which distribution we're building on.
+# This will determine any changes in menu structure or release number (i.e. .mdk)
+# Eventually, need to make this configurable from the rpmbuild command line.
+
+%define freedesktop %(if [ -e /usr/share/applications ]; then echo 1; else echo 0; fi;)
+%define conectiva %(if [ -e /etc/conectiva-release ]; then echo 1; else echo 0; fi;)
+%define mdk %(if [ -e /etc/mandrake-release ]; then echo 1; else echo 0; fi;)
+%define suse %(if [ -e /etc/SuSE-release ]; then echo 1; else echo 0; fi;)
+%define oldsuse 0
+%if %{suse}+ %define oldsuse %(if [ `grep VERSION /etc/SuSE-release | sed -e "s/VERSION = //"` \\< 8.0 ]; then echo 1; else echo 0; fi;)
+%endif
+
+%define oldredhat %(if [ -e /etc/redhat-release ]; then echo 1; else echo 0; fi;) && !%{mdk} && !%{suse} && !%{conectiva} && !%{freedesktop}+%define plain !%{mdk} && !%{suse} && !%{conectiva} && !%{oldredhat} && !%{freedesktop}+
Summary: C library and frontend for decoding MPEG2/4 AAC
Name: faad2
Version: @VERSION@
@@ -7,8 +25,20 @@
Source0: http://download.sourceforge.net/faad/%{name}-%{version}.tar.gz #Patch: faad2-%{version}.patchBuildRequires: autoconf, automake, libtool, gcc-c++
-BuildRequires: xmms-devel, id3lib-devel, gtk-devel
+BuildRequires: xmms-devel, id3lib-devel
URL: http://www.audiocoding.com/
+#################################################################################
+# GTK Dependencies
+%if %{mdk}+BuildRequires: libgtk+-devel >= 1.2.0
+%endif
+%if %{suse}+BuildRequires: gtk-devel >= 1.2.0
+%endif
+%if !%{suse} && !%{mdk}+BuildRequires: gtk+-devel >= 1.2.0
+%endif
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootPackager: [email protected]
@@ -41,13 +71,6 @@
(.mp4). MPEG4 files with AAC inside can be read by RealPlayer or Quicktime.
-%package libmp4v2
-Summary: C++ library to handle MP4 (Quicktime) content
-Group: Development/Libraries
-
-%description libmp4v2
-C++ library to handle MP4 (Quicktime) content
-
%prep
#%setup -n %{name} %setup -n %{name}-%{version}@@ -75,16 +98,13 @@
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_bindir}/* %{_libdir}/libfaad.so*-%{_libdir}/libmp4ff.so*%files devel
%defattr(-, root, root)
%{_libdir}/libfaad.a %{_libdir}/libfaad.la-%{_libdir}/libmp4ff.a-%{_libdir}/libmp4ff.la %{_includedir}/faad.h-%{_includedir}/mp4ff.h+%{_includedir}/neaacdec.h%files xmms
%defattr(-,root,root)
@@ -91,14 +111,15 @@
%doc plugins/xmms/README
%_libdir/xmms/Input/*
-%files libmp4v2
-%defattr(-, root, root)
-%{_libdir}/libmp4v2.*-%{_includedir}/mp4.h-%{_includedir}/mpeg4ip.h-%{_includedir}/systems.h-
%changelog
+* Tue Nov 02 2004 Alexander Kurpiers <[email protected]>
+- remove libmp4ff and libmp4v2 from RPM
+- changes for new version of faad2
+
+* Sat Apr 17 2004 Alexander Kurpiers <[email protected]>
+- apply fix to make DRM support work
+- use "platform-independant" dependencies (taken from dillo.spec)
+
* Fri Feb 06 2004 Alexander Kurpiers <[email protected]>
- remove seperate libmp4ff target
--- a/libfaad/Makefile.am
+++ b/libfaad/Makefile.am
@@ -15,11 +15,13 @@
sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c sbr_dec.c \
analysis.h bits.h cfft.h cfft_tab.h common.h \
decoder.h drc.h drm_dec.h error.h fixed.h filtbank.h \
-huffman.h ic_predict.h iq_table.h is.h kbd_win.h lt_predict.h mdct.h mp4.h \
-ms.h output.h pns.h pulse.h rvlc.h sine_win.h ssr.h ssr_fb.h ssr_ipqf.h \
-ssr_win.h specrec.h syntax.h structs.h tns.h \
+huffman.h ic_predict.h iq_table.h is.h kbd_win.h lt_predict.h \
+mdct.h mdct_tab.h mp4.h ms.h output.h pns.h ps_dec.h ps_tables.h \
+pulse.h rvlc.h \
sbr_dct.h sbr_dec.h sbr_e_nf.h sbr_fbt.h sbr_hfadj.h sbr_hfgen.h \
sbr_huff.h sbr_noise.h sbr_qmf.h sbr_syntax.h sbr_tf_grid.h \
+sine_win.h specrec.h ssr.h ssr_fb.h ssr_ipqf.h \
+ssr_win.h syntax.h structs.h tns.h \
sbr_qmf_c.h codebook/hcb.h \
codebook/hcb_1.h codebook/hcb_2.h codebook/hcb_3.h codebook/hcb_4.h \
codebook/hcb_5.h codebook/hcb_6.h codebook/hcb_7.h codebook/hcb_8.h \