~ft/aacdec

e2634aa96270d47ff82c6b355f84665d62f22e89 — menno 17 years ago bafbfab
even more more Final changes for version 2.0
4 files changed, 48 insertions(+), 32 deletions(-)

M Makefile.am
M configure.in
M faad2.spec
M plugins/Makefile.am
M Makefile.am => Makefile.am +5 -0
@@ 1,3 1,8 @@
SUBDIRS = libfaad common frontend plugins

EXTRA_DIST = faad2.spec

rpm:    Makefile
       make dist
       $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
       rm $(PACKAGE)-$(VERSION).tar.gz

M configure.in => configure.in +20 -14
@@ 11,6 11,7 @@ AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm)

AM_CONFIG_HEADER(config.h)



@@ 87,23 88,26 @@ else
fi

if test x$WITHXMMS = xyes; then
AC_MSG_NOTICE(
***
*** the xmms plugin must be build after faad
*** you need to have libfaad and libmp4v2 installed on your system
*** and also xmms installed correctly
*** before the creation of the xmms plugin

*** xmms plugin requires libmp4v2 to be build
*** so libmp4v2 will be build and install

*** after this build install the package and go into plugins/xmms
*** and run configure in this directory
***)
  AC_CHECK_PROGS(XMMS_CONFIG, xmms-config,"not_found")
  if test "$XMMS_CONFIG" = "not_found"; then
    AC_MSG_ERROR("*** xmms-config not found - xmms plugin can't be build")
  fi
  AC_CHECK_HEADER(pthread.h,,
           AC_MSG_ERROR(*** pthread headers support not installed or not found))
  AC_CHECK_HEADER(id3.h,,
       AC_MSG_ERROR(*** id3lib headers support not installed or not found))
  AC_CHECK_PROGS(GTK_CONFIG, gtk-config, "not_found")
  if test "$XGTK_CONFIG" = "not_found"; then
    AC_MSG_ERROR("*** gtk-config not found - xmms plugin can't be build without")
  fi

  AM_CONDITIONAL(HAVE_XMMS, true)
  AC_MSG_NOTICE("xmms plugin requires libmp4v2 to be build")
  AM_CONDITIONAL(WITH_MP4V2, true)
  AC_CONFIG_FILES(plugins/xmms/Makefile plugins/xmms/src/Makefile)
else
 AC_MSG_NOTICE(no xmms build configured)
# AM_CONDITIONAL(HAVE_XMMS, false)
 AM_CONDITIONAL(HAVE_XMMS, false)
fi

if test x$WITHDRM = xyes; then


@@ 115,4 119,6 @@ AC_CONFIG_FILES(libfaad/Makefile frontend/Makefile common/Makefile plugins/Makef
AC_CONFIG_FILES(plugins/mpeg4ip/Makefile)

AC_CONFIG_FILES(common/mp4ff/Makefile common/mp4v2/Makefile)

AC_CONFIG_FILES(faad2.spec)
AC_OUTPUT

M faad2.spec => faad2.spec +14 -17
@@ 1,13 1,13 @@
Summary:    C library and frontend for decoding MPEG2/4 AAC
Name:       faad2
Version:    2.0.rc3
Version:    @VERSION@
Release:    1
License:    GPL
Group:      Applications/Multimedia
Source0:    http://download.sourceforge.net/faad/%{name}-%{version}.tar.gz
#Patch:                faad2-%{version}.patch
BuildRequires: autoconf, automake, libtool, gcc-c++
BuildRequires: xmms-devel, id3lib-devel, gtk+-devel
BuildRequires: xmms-devel, id3lib-devel, gtk-devel
URL:        http://www.audiocoding.com/
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root
Packager:   a.kurpiers@nt.tu-darmstadt.de


@@ 16,6 16,9 @@ Packager:   a.kurpiers@nt.tu-darmstadt.de
FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
written from scratch. FAAD 2 is licensed under the GPL.

Includes libmp4ff, a Quicktime library for UNIX in a freely redistributable,
statically linkable library.

%package devel
Summary: Development libraries the FAAD 2 AAC decoder.
Group: Development/Libraries


@@ 27,7 30,7 @@ Header files and development documentation for libfaad.
%package xmms
Group: Applications/Multimedia
Summary: AAC and MP4 input plugin for xmms
Requires: %{name}, %{name}-libmp4ff, xmms, id3lib
Requires: %{name}, %{name}-libmp4v2, xmms, id3lib


%description xmms


@@ 45,15 48,6 @@ Group: Development/Libraries
%description libmp4v2
C++ library to handle MP4 (Quicktime) content


%package libmp4ff
Summary: Library to handle MP4 (Quicktime)
Group: Development/Libraries

%description libmp4ff
This is a Quicktime library for UNIX in a freely redistributable,
statically linkable library.

%prep
#%setup -n %{name}
%setup -n %{name}-%{version}


@@ 81,12 75,16 @@ rm -rf %{buildroot}
%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

%files xmms
%defattr(-,root,root)


@@ 98,13 96,12 @@ rm -rf %{buildroot}
%{_libdir}/libmp4v2.*
%{_includedir}/mp4.h
%{_includedir}/mpeg4ip.h

%files libmp4ff
%defattr(-, root, root)
%{_libdir}/libmp4ff.*
%{_includedir}/mp4ff.h
%{_includedir}/systems.h

%changelog
* Fri Feb 06 2004 Alexander Kurpiers <a.kurpiers@nt.tu-darmstadt.de>
- remove seperate libmp4ff target

* Wed Nov 05 2003 Alexander Kurpiers <a.kurpiers@nt.tu-darmstadt.de>
- include xmms plugins/libmp4v2/libmp4ff into RPM


M plugins/Makefile.am => plugins/Makefile.am +9 -1
@@ 1,5 1,13 @@
if HAVE_MPEG4IP
if HAVE_XMMS
SUBDIRS = mpeg4ip xmms
else
SUBDIRS = mpeg4ip
endif
else
SUBDIRS = 
if HAVE_XMMS
SUBDIRS = xmms
else
SUBDIRS =
endif
endif