Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=b78d10e2b1d3ff44e5a74f23cfb6bb0063f7a03a
commit b78d10e2b1d3ff44e5a74f23cfb6bb0063f7a03a Author: kikadf <[email protected]> Date: Wed Feb 25 10:54:33 2015 +0100 libmp4v2-2.0.0-1-x86_64 * Version bump diff --git a/source/multimedia/libmp4v2/Fix_strcasestr.diff b/source/multimedia/libmp4v2/Fix_strcasestr.diff deleted file mode 100644 index 635e393..0000000 --- a/source/multimedia/libmp4v2/Fix_strcasestr.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- mpeg4ip-1.6dfsg.orig/include/mpeg4ip.h 2009-10-06 14:51:41.381661458 +0200 -+++ mpeg4ip-1.6dfsg/include/mpeg4ip.h 2009-10-06 15:08:24.045607069 +0200 -@@ -123,7 +123,6 @@ - #ifdef __cplusplus - extern "C" { - #endif --char *strcasestr(const char *haystack, const char *needle); - #ifdef __cplusplus - } - #endif diff --git a/source/multimedia/libmp4v2/FrugalBuild b/source/multimedia/libmp4v2/FrugalBuild index 0f79a90..5390aa4 100644 --- a/source/multimedia/libmp4v2/FrugalBuild +++ b/source/multimedia/libmp4v2/FrugalBuild @@ -1,61 +1,21 @@ -# Compiling Time: 0.74 SBU -# Maintainer: crazy <[email protected]> +# Compiling Time: 0.47 SBU +# Maintainer: kikadf <[email protected]> +# Contributor: crazy <[email protected]> + +options+=('asneeded') pkgname=libmp4v2 -pkgver=1.6 -pkgrel=3 +pkgver=2.0.0 +pkgrel=1 pkgdesc="A library for working with files using the mp4 container format. (extracted from mpeg4ip)." -_F_sourceforge_dirname="mpeg4ip" -_F_sourceforge_name="mpeg4ip" -Finclude sourceforge +_F_googlecode_name="mp4v2" +#_F_archive_name="mp4v2" +_F_googlecode_ext=".tar.bz2" +Finclude googlecode depends=('libstdc++') -url="http://mpeg4ip.sourceforge.net/"; -source=($source \ - compile.patch \ - autoreconf.patch \ - from-mpeg4ip-1.6.1-mp4v2_fixes.patch \ - Fix_strcasestr.diff) groups=('multimedia') archs=('i686' 'x86_64' 'arm') -sha1sums=('2d0d42a00c161f5152f8f2fd33ef192209ffb8c4' \ - '4325daa5f3ffa38c61f74d438a0221e2a1909ac7' \ - '40b3370027cace5e3cfecfbf15798bf0ade5f036' \ - '5a2944a6ea56fd255cafef7626eaed60fed170e2' \ - '052b838d5a1856ee8cf39804b4b67ecef10b472b') - -build() -{ - Fcd mpeg4ip-$pkgver - ## hack to allow autoreconf - touch bootstrapped || Fdie - 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 \ - --disable-player \ - --disable-x264 \ - --disable-warns-as-err \ - --disable-server \ - --disable-mp4live \ - --disable-id3tags \ - --disable-xvid \ - --disable-a52dec \ - --disable-mad \ - --disable-mpeg2dec \ - --disable-mp3lame \ - --disable-faac \ - --disable-ffmpeg - cd lib/mp4v2 || Fdie - make || Fdie - Fmakeinstall - +sha1sums=('193260cfb7201e6ec250137bcca1468d4d20e2f0') -} # optimization OK diff --git a/source/multimedia/libmp4v2/autoreconf.patch b/source/multimedia/libmp4v2/autoreconf.patch deleted file mode 100644 index 9c3e8d4..0000000 --- a/source/multimedia/libmp4v2/autoreconf.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 772dd2b..0000000 --- a/source/multimedia/libmp4v2/compile.patch +++ /dev/null @@ -1,22 +0,0 @@ -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/from-mpeg4ip-1.6.1-mp4v2_fixes.patch b/source/multimedia/libmp4v2/from-mpeg4ip-1.6.1-mp4v2_fixes.patch deleted file mode 100644 index 6f3ba04..0000000 --- a/source/multimedia/libmp4v2/from-mpeg4ip-1.6.1-mp4v2_fixes.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4.cpp ---- mpeg4ip-1.6/lib/mp4v2/mp4.cpp 2007-07-19 20:09:44.000000000 +0200 -+++ mpeg4ip-1.6.1/lib/mp4v2/mp4.cpp 2007-09-28 22:45:11.000000000 +0200 -@@ -119,15 +119,16 @@ - try { - pFile = new MP4File(verbosity); - // LATER useExtensibleFormat, moov first, then mvex's -- pFile->Modify(fileName); -+ if (pFile->Modify(fileName)) - return (MP4FileHandle)pFile; - } - catch (MP4Error* e) { - VERBOSE_ERROR(verbosity, e->Print()); - delete e; -- delete pFile; -- return MP4_INVALID_FILE_HANDLE; - } -+ -+ if (pFile) delete pFile; -+ return MP4_INVALID_FILE_HANDLE; - } - - extern "C" bool MP4Optimize(const char* existingFileName, -diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4file.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4file.cpp ---- mpeg4ip-1.6/lib/mp4v2/mp4file.cpp 2007-07-05 18:38:02.000000000 +0200 -+++ mpeg4ip-1.6.1/lib/mp4v2/mp4file.cpp 2007-09-28 22:45:11.000000000 +0200 -@@ -195,7 +195,7 @@ - } - - --void MP4File::Modify(const char* fileName) -+bool MP4File::Modify(const char* fileName) - { - m_fileName = MP4Stralloc(fileName); - m_mode = 'r'; -@@ -211,7 +211,8 @@ - - if (pMoovAtom == NULL) { - // there isn't one, odd but we can still proceed -- pMoovAtom = AddChildAtom(m_pRootAtom, "moov"); -+ return false; -+ //pMoovAtom = AddChildAtom(m_pRootAtom, "moov"); - } else { - numAtoms = m_pRootAtom->GetNumberOfChildAtoms(); - -@@ -285,6 +286,7 @@ - - // start writing new mdat - pMdatAtom->BeginWrite(Use64Bits("mdat")); -+ return true; - } - - void MP4File::Optimize(const char* orgFileName, const char* newFileName) -@@ -624,7 +626,6 @@ - ASSERT(m_pTracks[i]); - m_pTracks[i]->FinishWrite(); - } -- - // ask root atom to write - m_pRootAtom->FinishWrite(); - -diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4file.h mpeg4ip-1.6.1/lib/mp4v2/mp4file.h ---- mpeg4ip-1.6/lib/mp4v2/mp4file.h 2007-06-04 18:21:51.000000000 +0200 -+++ mpeg4ip-1.6.1/lib/mp4v2/mp4file.h 2007-09-28 22:45:11.000000000 +0200 -@@ -56,7 +56,7 @@ - char* majorBrand = NULL, - u_int32_t minorVersion = 0, char** supportedBrands = NULL, - u_int32_t supportedBrandsCount = 0); -- void Modify(const char* fileName); -+ bool Modify(const char* fileName); - void Optimize(const char* orgFileName, - const char* newFileName = NULL); - void Dump(FILE* pDumpFile = NULL, bool dumpImplicits = false); -diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4.h mpeg4ip-1.6.1/lib/mp4v2/mp4.h ---- mpeg4ip-1.6/lib/mp4v2/mp4.h 2007-09-19 19:44:49.000000000 +0200 -+++ mpeg4ip-1.6.1/lib/mp4v2/mp4.h 2007-09-28 22:45:11.000000000 +0200 -@@ -1287,6 +1287,9 @@ - uint32_t decodeSize, - uint32_t *pDataSize); - void MP4Free(void *p); -+ -+ void MP4SetLibFunc(lib_message_func_t libfunc); -+ - #ifdef __cplusplus - } - #endif -diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4track.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4track.cpp ---- mpeg4ip-1.6/lib/mp4v2/mp4track.cpp 2007-04-12 19:04:03.000000000 +0200 -+++ mpeg4ip-1.6.1/lib/mp4v2/mp4track.cpp 2007-09-28 22:45:11.000000000 +0200 -@@ -483,6 +483,7 @@ - { - // write out any remaining samples in chunk buffer - WriteChunkBuffer(); -+ - if (m_pStszFixedSampleSizeProperty == NULL && - m_stsz_sample_bits == 4) { - if (m_have_stz2_4bit_sample) { -@@ -646,7 +647,10 @@ - numBytes /= m_bytesPerSample; - } - // for first sample -- if (sampleId == 1) { -+ // wmay - if we are adding, we want to make sure that -+ // we don't inadvertently set up the fixed size again. -+ // so, we check the number of samples -+ if (sampleId == 1 && GetNumberOfSamples() == 0) { - if (m_pStszFixedSampleSizeProperty == NULL || - numBytes == 0) { - // special case of first sample is zero bytes in length -@@ -670,13 +674,15 @@ - // doesn't match our sample size, we need to write the current - // sample size into the table - if (fixedSampleSize == 0 || numBytes != fixedSampleSize) { -- - if (fixedSampleSize != 0) { - // fixed size was set; we need to clear fixed sample size - m_pStszFixedSampleSizeProperty->SetValue(0); - - // and create sizes for all previous samples -- for (MP4SampleId sid = 1; sid < sampleId; sid++) { -+ // use GetNumberOfSamples due to needing the total number -+ // not just the appended part of the file -+ uint32_t samples = GetNumberOfSamples(); -+ for (MP4SampleId sid = 1; sid <= samples; sid++) { - SampleSizePropertyAddValue(fixedSampleSize); - } - } -@@ -1345,7 +1351,8 @@ - (MP4Property**)&m_pStssSampleProperty)); - - // set values for all samples that came before this one -- for (MP4SampleId sid = 1; sid < sampleId; sid++) { -+ uint32_t samples = GetNumberOfSamples(); -+ for (MP4SampleId sid = 1; sid < samples; sid++) { - m_pStssSampleProperty->AddValue(sid); - m_pStssCountProperty->IncrementValue(); - } -diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4util.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4util.cpp ---- mpeg4ip-1.6/lib/mp4v2/mp4util.cpp 2007-04-12 19:04:03.000000000 +0200 -+++ mpeg4ip-1.6.1/lib/mp4v2/mp4util.cpp 2007-09-28 22:45:11.000000000 +0200 -@@ -22,8 +22,21 @@ - - #include "mp4common.h" - -+static lib_message_func_t libfunc = NULL; -+extern "C" void MP4SetLibFunc(lib_message_func_t libf) -+{ -+ libfunc = libf; -+} -+ - void MP4Error::Print(FILE* pFile) - { -+ if (libfunc != NULL) { -+ (libfunc)(LOG_ERR, "MP4ERROR", "%s:%s:%s", -+ m_where == NULL ? "" : m_where, -+ m_errstring == NULL ? "" : m_errstring, -+ m_errno ? strerror(m_errno) : ""); -+ return; -+ } - fprintf(pFile, "MP4ERROR: "); - if (m_where) { - fprintf(pFile, "%s", m_where); -diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4util.h mpeg4ip-1.6.1/lib/mp4v2/mp4util.h ---- mpeg4ip-1.6/lib/mp4v2/mp4util.h 2007-05-24 21:13:17.000000000 +0200 -+++ mpeg4ip-1.6.1/lib/mp4v2/mp4util.h 2007-09-28 22:45:11.000000000 +0200 -@@ -26,8 +26,7 @@ - #ifndef ASSERT - #define ASSERT(expr) \ - if (!(expr)) { \ -- (void)fflush(stdout); \ -- assert((expr)); \ -+ throw new MP4Error("assert failure", __STRING((expr))); \ - } - #endif - #define WARNING(expr) \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
