Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4cec6a457f8aeb95d7c90975d53319c918eb41bc
commit 4cec6a457f8aeb95d7c90975d53319c918eb41bc
Author: crazy <[EMAIL PROTECTED]>
Date: Thu Sep 20 23:05:30 2007 +0200
libmp4v2-1.6-1-i686
* Version bump
* removed old patch , added 2 new patches
* added some hacks in FB to allow running autoreconf
diff --git a/source/multimedia/libmp4v2/FrugalBuild
b/source/multimedia/libmp4v2/FrugalBuild
index eea2588..bc14e70 100644
--- a/source/multimedia/libmp4v2/FrugalBuild
+++ b/source/multimedia/libmp4v2/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <[EMAIL PROTECTED]>
pkgname=libmp4v2
-pkgver=1.5.0.1
+pkgver=1.6
pkgrel=1
pkgdesc="A library for working with files using the mp4 container format.
(extracted from mpeg4ip)."
_F_sourceforge_dirname="mpeg4ip"
@@ -10,19 +10,25 @@ _F_sourceforge_name="mpeg4ip"
Finclude sourceforge
depends=('libstdc++')
url="http://mpeg4ip.sourceforge.net/";
-source=($source $pkgname.patch)
+source=($source compile.patch autoreconf.patch)
groups=('multimedia')
archs=('i686' 'x86_64')
-sha1sums=('1271de695ed65284d9c39aa91bf26c5494603fd3' \
- 'f24357ce9a3055b9f5d5431be1f187fa88cc58d4')
+sha1sums=('2d0d42a00c161f5152f8f2fd33ef192209ffb8c4' \
+ '4325daa5f3ffa38c61f74d438a0221e2a1909ac7' \
+ '40b3370027cace5e3cfecfbf15798bf0ade5f036')
build()
{
Fcd mpeg4ip-$pkgver
- ## brrr
+ ## hack to allow autoreconf
touch bootstrapped || Fdie
- Fpatchall
+ touch lib/SDLAudio/{NEWS,AUTHORS,ChangeLog} || Fdie
+ touch common/video/iso-mpeg4/{NEWS,AUTHORS,ChangeLog} || Fdie
+ Fsed 'AM_PATH_GTK_2_0' '' configure.in
+ Fsed 'AM_PATH_ALSA' '' configure.in
libtoolize --copy --force || Fdie
+ Fpatchall
+ Fautoreconf
export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
Fconf \
--disable-srtp \
@@ -39,7 +45,7 @@ build()
--disable-mp3lame \
--disable-faac \
--disable-ffmpeg
- cd lib/mp4v2
+ cd lib/mp4v2 || Fdie
make || Fdie
Fmakeinstall
diff --git a/source/multimedia/libmp4v2/autoreconf.patch
b/source/multimedia/libmp4v2/autoreconf.patch
new file mode 100644
index 0000000..9c3e8d4
--- /dev/null
+++ b/source/multimedia/libmp4v2/autoreconf.patch
@@ -0,0 +1,11 @@
+diff -Nuapr mpeg4ip-1.6/lib/SDLAudio/configure.in
mpeg4ip-1.6-p/lib/SDLAudio/configure.in
+--- mpeg4ip-1.6/lib/SDLAudio/configure.in 2005-01-13 19:21:29.000000000
+0100
++++ mpeg4ip-1.6-p/lib/SDLAudio/configure.in 2007-09-20 14:57:51.000000000
+0200
+@@ -47,6 +47,7 @@ dnl Check for tools
+
+ AC_LIBTOOL_WIN32_DLL
+ AM_PROG_LIBTOOL
++AM_PROG_AS
+ AC_PROG_MAKE_SET
+ AC_PROG_CC
+ AC_C_INLINE
diff --git a/source/multimedia/libmp4v2/compile.patch
b/source/multimedia/libmp4v2/compile.patch
new file mode 100644
index 0000000..772dd2b
--- /dev/null
+++ b/source/multimedia/libmp4v2/compile.patch
@@ -0,0 +1,22 @@
+diff -Nuapr mpeg4ip-1.6/lib/mp4v2/Makefile.am
mpeg4ip-1.6-p/lib/mp4v2/Makefile.am
+--- mpeg4ip-1.6/lib/mp4v2/Makefile.am 2007-07-24 22:32:28.000000000 +0200
++++ mpeg4ip-1.6-p/lib/mp4v2/Makefile.am 2007-09-20 15:07:34.000000000
+0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = . test util
++SUBDIRS = .
+
+ INCLUDES = -I$(top_srcdir)/include
+
+@@ -6,7 +6,10 @@ AM_CXXFLAGS = @BILLS_CPPWARNINGS@
+
+ lib_LTLIBRARIES = libmp4v2.la
+
+-include_HEADERS = mp4.h
++include_HEADERS = mp4.h \
++ $(top_srcdir)/include/mpeg4ip.h \
++ $(top_srcdir)/include/mpeg4ip_version.h \
++ $(top_srcdir)/mpeg4ip_config.h
+
+ libmp4v2_la_SOURCES = \
+ 3gp.cpp \
+
diff --git a/source/multimedia/libmp4v2/libmp4v2.patch
b/source/multimedia/libmp4v2/libmp4v2.patch
deleted file mode 100644
index 1d9c70c..0000000
--- a/source/multimedia/libmp4v2/libmp4v2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naurp mpeg4ip-1.5.0.1/lib/mp4v2/Makefile.am
mpeg4ip-1.5.0.1-p/lib/mp4v2/Makefile.am
---- mpeg4ip-1.5.0.1/lib/mp4v2/Makefile.am 2006-05-11 20:11:52.000000000
+0200
-+++ mpeg4ip-1.5.0.1-p/lib/mp4v2/Makefile.am 2006-11-19 12:35:11.000000000
+0100
-@@ -1,4 +1,4 @@
--SUBDIRS = . test util
-+SUBDIRS = .
-
- INCLUDES = -I$(top_srcdir)/include
-
-@@ -6,7 +6,7 @@ AM_CXXFLAGS = @BILLS_CPPWARNINGS@
-
- lib_LTLIBRARIES = libmp4v2.la
-
--include_HEADERS = mp4.h
-+include_HEADERS = mp4.h $(top_srcdir)/include/mpeg4ip.h
$(top_srcdir)/include/mpeg4ip_version.h $(top_srcdir)/mpeg4ip_config.h
-
- libmp4v2_la_SOURCES = \
- 3gp.cpp \
-diff -Naurp mpeg4ip-1.5.0.1/lib/mp4v2/Makefile.in
mpeg4ip-1.5.0.1-p/lib/mp4v2/Makefile.in
---- mpeg4ip-1.5.0.1/lib/mp4v2/Makefile.in 2006-06-08 21:17:29.000000000
+0200
-+++ mpeg4ip-1.5.0.1-p/lib/mp4v2/Makefile.in 2006-11-19 12:37:33.000000000
+0100
-@@ -284,11 +284,11 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = . test util
-+SUBDIRS = .
- INCLUDES = -I$(top_srcdir)/include
- AM_CXXFLAGS = @BILLS_CPPWARNINGS@
- lib_LTLIBRARIES = libmp4v2.la
--include_HEADERS = mp4.h
-+include_HEADERS = mp4.h $(top_srcdir)/include/mpeg4ip.h
$(top_srcdir)/include/mpeg4ip_version.h $(top_srcdir)/mpeg4ip_config.h
- libmp4v2_la_SOURCES = \
- 3gp.cpp \
- atom_amr.cpp \
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
