[134147] trunk/dports/multimedia/MP4Joiner

[ryandesign at macports.org]

Revision: 134147
          https://trac.macports.org/changeset/134147
Author:   ryandesign at macports.org
Date:     2015-03-18 21:59:17 -0700 (Wed, 18 Mar 2015)
Log Message:
-----------
MP4Joiner: update to 2.2

Modified Paths:
--------------
    trunk/dports/multimedia/MP4Joiner/Portfile
    trunk/dports/multimedia/MP4Joiner/files/patch-Makefile.in.diff

Removed Paths:
-------------
    trunk/dports/multimedia/MP4Joiner/files/patch-Info.plist.in.diff

Modified: trunk/dports/multimedia/MP4Joiner/Portfile
===================================================================
--- trunk/dports/multimedia/MP4Joiner/Portfile	2015-03-19 01:54:28 UTC (rev 134146)
+++ trunk/dports/multimedia/MP4Joiner/Portfile	2015-03-19 04:59:17 UTC (rev 134147)
@@ -5,8 +5,7 @@
 PortGroup           wxWidgets 1.0
 
 name                MP4Joiner
-version             2.1.2
-revision            3
+version             2.2
 categories          multimedia aqua
 platforms           darwin
 maintainers         ryandesign openmaintainer
@@ -20,8 +19,8 @@
 master_sites        sourceforge:project/mp4joiner/MP4Joiner/${version}/
 use_bzip2           yes
 
-checksums           rmd160  90d3670fe890a155dfec246ac3af248d2127454f \
-                    sha256  f2f3a77258e9160f5c72fb467b2a77bba0d05e112fc8ee53870fbfd2ea8ee5fc
+checksums           rmd160  b219127b0e30ff99d039a868b0751b763452ea4f \
+                    sha256  39428a63bb234c90800a261b3c1a7a19d887045bf8611ec185c1c7bdabfcaddf
 
 wxWidgets.use       wxWidgets-3.0
 
@@ -33,8 +32,7 @@
 # gpac is not universal but we only use its MP4Box program not its libraries
 depends_skip_archcheck gpac
 
-patchfiles          patch-Info.plist.in.diff \
-                    patch-Makefile.in.diff \
+patchfiles          patch-Makefile.in.diff
 
 configure.args      --with-wxdir=${wxWidgets.wxdir}
 

Deleted: trunk/dports/multimedia/MP4Joiner/files/patch-Info.plist.in.diff
===================================================================
--- trunk/dports/multimedia/MP4Joiner/files/patch-Info.plist.in.diff	2015-03-19 01:54:28 UTC (rev 134146)
+++ trunk/dports/multimedia/MP4Joiner/files/patch-Info.plist.in.diff	2015-03-19 04:59:17 UTC (rev 134147)
@@ -1,11 +0,0 @@
---- Info.plist.in.orig	2013-01-12 01:56:34.000000000 -0600
-+++ Info.plist.in	2013-11-14 15:38:13.000000000 -0600
-@@ -17,7 +17,7 @@
- 	<key>CFBundlePackageType</key>
- 	<string>APPL</string>
- 	<key>CFBundleSignature</key>
--	<string>MP4Joiner</string>
-+	<string>????</string>
- 	<key>CFBundleVersion</key>
- 	<string>@VERSION@</string>
- 	<key>CFBundleShortVersionString</key>

Modified: trunk/dports/multimedia/MP4Joiner/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/multimedia/MP4Joiner/files/patch-Makefile.in.diff	2015-03-19 01:54:28 UTC (rev 134146)
+++ trunk/dports/multimedia/MP4Joiner/files/patch-Makefile.in.diff	2015-03-19 04:59:17 UTC (rev 134147)
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2013-11-11 13:58:49.000000000 -0600
-+++ Makefile.in	2013-11-14 15:37:45.000000000 -0600
-@@ -818,21 +818,19 @@
+--- Makefile.in.orig	2015-03-17 01:40:48.000000000 -0500
++++ Makefile.in	2015-03-18 23:52:33.000000000 -0500
+@@ -825,32 +825,19 @@
  run: all
  	$(MAKE) -C src run
  
@@ -12,15 +12,26 @@
  	-mkdir MP4Joiner.app/Contents/Resources
  	-mkdir MP4Joiner.app/Contents/Resources/English.lproj
  	cp Info.plist MP4Joiner.app/Contents/
--	echo -n "MP4Joiner" > MP4Joiner.app/Contents/PkgInfo
+-	echo -n "APPL????" > MP4Joiner.app/Contents/PkgInfo
 +	printf "APPL????" > MP4Joiner.app/Contents/PkgInfo
  	cp src/mp4joiner MP4Joiner.app/Contents/MacOS/MP4Joiner
  	cp resources/mp4joiner.icns MP4Joiner.app/Contents/Resources/MP4Joiner.icns
  	-mkdir MP4Joiner.app/Contents/locale
- 	(cd locale && cp -r de ru ../MP4Joiner.app/Contents/locale/)
+ 	(cd locale && cp -r de es pt ru ../MP4Joiner.app/Contents/locale/)
 -	cp /opt/local/bin/ffmpeg MP4Joiner.app/Contents/MacOS/
  	strip MP4Joiner.app/Contents/MacOS/MP4Joiner
 -	strip MP4Joiner.app/Contents/MacOS/ffmpeg
+-	cp /Applications/Osmo4.app/Contents/MacOS/MP4Box MP4Joiner.app/Contents/MacOS/
+-	-mkdir MP4Joiner.app/Contents/MacOS/lib/
+-	cp /Applications/Osmo4.app/Contents/MacOS/lib/libcrypto.1.0.0.dylib MP4Joiner.app/Contents/MacOS/lib/
+-	cp /Applications/Osmo4.app/Contents/MacOS/lib/libgpac.dylib MP4Joiner.app/Contents/MacOS/lib/
+-	cp /Applications/Osmo4.app/Contents/MacOS/lib/libjpeg.8.dylib MP4Joiner.app/Contents/MacOS/lib/
+-	cp /Applications/Osmo4.app/Contents/MacOS/lib/libjs.dylib MP4Joiner.app/Contents/MacOS/lib/
+-	cp /Applications/Osmo4.app/Contents/MacOS/lib/libnspr4.dylib MP4Joiner.app/Contents/MacOS/lib/
+-	cp /Applications/Osmo4.app/Contents/MacOS/lib/libplc4.dylib MP4Joiner.app/Contents/MacOS/lib/
+-	cp /Applications/Osmo4.app/Contents/MacOS/lib/libplds4.dylib MP4Joiner.app/Contents/MacOS/lib/
+-	cp /Applications/Osmo4.app/Contents/MacOS/lib/libpng15.15.dylib MP4Joiner.app/Contents/MacOS/lib/
+-	cp /Applications/Osmo4.app/Contents/MacOS/lib/libssl.1.0.0.dylib MP4Joiner.app/Contents/MacOS/lib/
  
  libs:
  	dylibbundler -od -b -x ./MP4Joiner.app/Contents/MacOS/MP4Joiner -d ./MP4Joiner.app/Contents/libs/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150318/c8c79a0d/attachment.html>