diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe b/media-libs/libmp4v2/libmp4v2-2.1.1.recipe similarity index 72% rename from media-libs/libmp4v2/libmp4v2-2.0.0.recipe rename to media-libs/libmp4v2/libmp4v2-2.1.1.recipe index 20d3137ca..0e3468531 100644 --- a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe +++ b/media-libs/libmp4v2/libmp4v2-2.1.1.recipe @@ -5,14 +5,16 @@ This file format is derived from Apple's QuickTime file format that has been \ used as a multimedia file format in a variety of platforms and applications. \ It is a very powerful and extensible format that can accommodate practically \ any type of media." -HOMEPAGE="https://code.google.com/p/mp4v2/" -COPYRIGHT="2008 Kona Blend" +HOMEPAGE="https://mp4v2.org/" +COPYRIGHT="2001-2008 Cisco Systems Inc. \ + 2008-2009 Kona Blend \ + 2010-2013 Jeremy Noring \ + 2022 Robert Kausch" LICENSE="MPL v1.1" -REVISION="5" -SOURCE_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mp4v2/mp4v2-$portVersion.tar.bz2" -CHECKSUM_SHA256="0319b9a60b667cf10ee0ec7505eb7bdc0a2e21ca7a93db96ec5bd758e3428338" +REVISION="1" +SOURCE_URI="https://github.com/enzo1982/mp4v2/releases/download/v$portVersion/mp4v2-$portVersion.tar.bz2" +CHECKSUM_SHA256="29420c62e56a2e527fd8979d59d05ed6d83ebe27e0e2c782c1ec19a3a402eaee" SOURCE_DIR="mp4v2-$portVersion" -PATCHES="libmp4v2-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -28,7 +30,7 @@ PROVIDES=" cmd:mp4tags$secondaryArchSuffix cmd:mp4track$secondaryArchSuffix cmd:mp4trackdump$secondaryArchSuffix - lib:libmp4v2$secondaryArchSuffix = 2.0.0 compat >= 2 + lib:libmp4v2$secondaryArchSuffix = $portVersion compat >= 2 " REQUIRES=" haiku$secondaryArchSuffix @@ -36,7 +38,7 @@ REQUIRES=" PROVIDES_devel=" libmp4v2${secondaryArchSuffix}_devel = $portVersion compat >= 2 - devel:libmp4v2$secondaryArchSuffix = 2.0.0 compat >= 2 + devel:libmp4v2$secondaryArchSuffix = $portVersion compat >= 2 " REQUIRES_devel=" libmp4v2$secondaryArchSuffix == $portVersion base @@ -46,17 +48,14 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:gcc$secondaryArchSuffix + cmd:g++$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix + cmd:libtool$secondaryArchSuffix cmd:make " BUILD() { - autoreconf -fi runConfigure ./configure make $jobArgs } diff --git a/media-libs/libmp4v2/patches/libmp4v2-2.0.0.patchset b/media-libs/libmp4v2/patches/libmp4v2-2.0.0.patchset deleted file mode 100644 index 5bd3e0112..000000000 --- a/media-libs/libmp4v2/patches/libmp4v2-2.0.0.patchset +++ /dev/null @@ -1,141 +0,0 @@ -From 101dc16a0705978ca39fb46c455a1694dedf1108 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Wed, 3 Sep 2014 15:37:01 +0000 -Subject: applying patch libmp4v2-2.0.0.patch - - -diff --git a/configure.ac b/configure.ac -index 7c514eb..9fcca75 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4,23 +4,23 @@ - - m4_include([project/project.m4sugar]) - --m4_define([SVNINFO],m4_esyscmd([LANG=en svn info 2>/dev/null])) -- --changequote(<<,>>)dnl -- m4_define(<>,m4_bregexp(SVNINFO,<<^URL: *\(.+\)>>,<<\1>>)) -- m4_define(<>,m4_bregexp(PRJ_repo_url,<<\([^/]+\)$>>,<<\1>>)) -- m4_define(<>,m4_bregexp(SVNINFO,<<^Repository Root: *\(.+\)>>,<<\1>>)) -- m4_define(<>,m4_bregexp(SVNINFO,<<^Repository UUID: *\(.+\)>>,<<\1>>)) -- m4_define(<>,m4_bregexp(SVNINFO,<<^Last Changed Rev: *\(.+\)>>,<<\1>>)) -- m4_define(<>,m4_bregexp(SVNINFO,<<^Last Changed Date: *\(.+\)>>,<<\1>>)) -- m4_define(<>,ifelse(m4_bregexp(PRJ_repo_url,<>),<<-1>>,<>,<>)) --changequote([,])dnl -- --m4_define([PRJ_version_hex],m4_format([0x%04x%02x%02x],PRJ_version_major,PRJ_version_minor,PRJ_version_point)) -- --m4_define([PRJ_version],ifelse( -- PRJ_repo_type,[stable],m4_format([%s],PRJ_repo_branch), -- m4_format([%s-r%d],PRJ_repo_branch,PRJ_repo_rev))) -+#m4_define([SVNINFO],m4_esyscmd([LANG=en svn info 2>/dev/null])) -+# -+#changequote(<<,>>)dnl -+# m4_define(<>,m4_bregexp(SVNINFO,<<^URL: *\(.+\)>>,<<\1>>)) -+# m4_define(<>,m4_bregexp(PRJ_repo_url,<<\([^/]+\)$>>,<<\1>>)) -+# m4_define(<>,m4_bregexp(SVNINFO,<<^Repository Root: *\(.+\)>>,<<\1>>)) -+# m4_define(<>,m4_bregexp(SVNINFO,<<^Repository UUID: *\(.+\)>>,<<\1>>)) -+# m4_define(<>,m4_bregexp(SVNINFO,<<^Last Changed Rev: *\(.+\)>>,<<\1>>)) -+# m4_define(<>,m4_bregexp(SVNINFO,<<^Last Changed Date: *\(.+\)>>,<<\1>>)) -+# m4_define(<>,ifelse(m4_bregexp(PRJ_repo_url,<>),<<-1>>,<>,<>)) -+#changequote([,])dnl -+# -+#m4_define([PRJ_version_hex],m4_format([0x%04x%02x%02x],PRJ_version_major,PRJ_version_minor,PRJ_version_point)) -+# -+#m4_define([PRJ_version],ifelse( -+# PRJ_repo_type,[stable],m4_format([%s],PRJ_repo_branch), -+# m4_format([%s-r%d],PRJ_repo_branch,PRJ_repo_rev))) - - ############################################################################### - # initialization -diff --git a/libplatform/platform_base.h b/libplatform/platform_base.h -index 5b6a263..22efab4 100644 ---- a/libplatform/platform_base.h -+++ b/libplatform/platform_base.h -@@ -6,9 +6,7 @@ - #include - #include - #include --#include - #include --#include - #include - #include - #include -diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp -index 76cdd12..47066fd 100644 ---- a/libutil/Utility.cpp -+++ b/libutil/Utility.cpp -@@ -431,7 +431,6 @@ Utility::printVersion( bool extended ) - << '\n' << setw(18) << "repository URL:" << MP4V2_PROJECT_repo_url - << '\n' << setw(18) << "repository root:" << MP4V2_PROJECT_repo_root - << '\n' << setw(18) << "repository UUID:" << MP4V2_PROJECT_repo_uuid -- << '\n' << setw(18) << "repository rev:" << MP4V2_PROJECT_repo_rev - << '\n' << setw(18) << "repository date:" << MP4V2_PROJECT_repo_date - << '\n' << setw(18) << "repository type:" << MP4V2_PROJECT_repo_type; - } -diff --git a/src/itmf/CoverArtBox.h b/src/itmf/CoverArtBox.h -index 023e3c9..369b55d 100644 ---- a/src/itmf/CoverArtBox.h -+++ b/src/itmf/CoverArtBox.h -@@ -111,7 +111,7 @@ public: - /// - /// @return true on failure, false on success. - /// -- static bool remove( MP4FileHandle hFile, uint32_t index = numeric_limits::max() ); -+ static bool remove( MP4FileHandle hFile, uint32_t index = 2147483647); - }; - - /////////////////////////////////////////////////////////////////////////////// --- -1.8.3.4 - - -From 33faaa0be34dcd2eb66fa05cbff57593c987acb9 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Wed, 3 Sep 2014 15:47:14 +0000 -Subject: strings.h isn't included - - -diff --git a/libplatform/platform_posix.h b/libplatform/platform_posix.h -index af5901a..8863ba4 100644 ---- a/libplatform/platform_posix.h -+++ b/libplatform/platform_posix.h -@@ -33,6 +33,9 @@ - #include - #include - #include -+#ifdef HAVE_STRINGS_H -+ #include -+#endif - - #include - --- -1.8.3.4 - - -From 85e5236d89a0ed724fb0a89fe46198d242687981 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 4 Sep 2014 15:22:17 +0000 -Subject: build fix - - -diff --git a/libplatform/platform_base.h b/libplatform/platform_base.h -index 22efab4..5b6a263 100644 ---- a/libplatform/platform_base.h -+++ b/libplatform/platform_base.h -@@ -6,7 +6,9 @@ - #include - #include - #include -+#include - #include -+#include - #include - #include - #include --- -1.8.3.4 -