Changeset 113987 for trunk/dports/multimedia

Timestamp:

Nov 27, 2013, 3:05:43 AM (6 years ago)

Author:

ryandesign@…

Message:

mp4v2: update the patchfile so it applies, from #38046

Location:

trunk/dports/multimedia/mp4v2

Files:

• Portfile (modified) (1 diff)
• files/mp4v2-1.9.1-libversion.patch (modified) (3 diffs)

trunk/dports/multimedia/mp4v2/Portfile

@@ -30 +30 @@
 platform darwin {
     if {${os.major} < 10} {
-        patchfiles          mp4v2-1.9.1-libversion.patch
+        patchfiles-append mp4v2-1.9.1-libversion.patch
     }
 }

trunk/dports/multimedia/mp4v2/files/mp4v2-1.9.1-libversion.patch

@@ -1 @@
-diff -Nru ../mp4v2-1.9.1-orig/GNUmakefile.in ./GNUmakefile.in
---- ../mp4v2-1.9.1-orig/GNUmakefile.in  2009-07-14 02:25:44.000000000 +0300
-+++ ./GNUmakefile.in    2009-10-10 11:12:15.000000000 +0300
-@@ -393,7 +393,6 @@
+diff -ur mp4v2-2.0.0.orig/GNUmakefile.in mp4v2-2.0.0/GNUmakefile.in
+--- GNUmakefile.in.orig 2012-05-20 17:18:00.000000000 -0500
++++ GNUmakefile.in      2013-08-07 14:17:10.000000000 -0500
+@@ -411,7 +411,6 @@
  X_GCH_STATIC = @X_GCH_STATIC@
  X_GCH_STATIC_FLAGS = @X_GCH_STATIC_FLAGS@
  X_MINGW_LIBS = @X_MINGW_LIBS@
 -X_libmp4v2_la_LDFLAGS = @X_libmp4v2_la_LDFLAGS@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -443,7 +442,7 @@
- lib_LTLIBRARIES = libmp4v2.la
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+@@ -470,7 +469,7 @@
+ ###############################################################################
+ libmp4v2_la_LDFLAGS = \
+     $(AM_LDFLAGS) \
+-    -version-number $(PROJECT_version_major):$(PROJECT_version_minor):$(PROJECT_version_point) $(X_libmp4v2_la_LDFLAGS)
++    -version-number $(PROJECT_version_major):$(PROJECT_version_minor):$(PROJECT_version_point)
  
- ###############################################################################
--libmp4v2_la_LDFLAGS = -version-number $(PROJECT_version_major):$(PROJECT_version_minor):$(PROJECT_version_point) $(X_libmp4v2_la_LDFLAGS)
-+libmp4v2_la_LDFLAGS = -version-number $(PROJECT_version_major):$(PROJECT_version_minor):$(PROJECT_version_point)
  libmp4v2_la_SOURCES = src/3gp.cpp src/atom_ac3.cpp src/atom_amr.cpp \
         src/atom_avc1.cpp src/atom_avcC.cpp src/atom_chpl.cpp \
-        src/atom_colr.cpp src/atom_d263.cpp src/atom_dac3.cpp \
-diff -Nru ../mp4v2-1.9.1-orig/configure ./configure
---- ../mp4v2-1.9.1-orig/configure       2009-07-14 02:25:42.000000000 +0300
-+++ ./configure 2009-10-10 11:12:19.000000000 +0300
-@@ -810,7 +810,6 @@
+diff -ur mp4v2-2.0.0.orig/configure mp4v2-2.0.0/configure
+--- configure.orig      2012-05-20 17:17:59.000000000 -0500
++++ configure   2013-08-07 14:18:13.000000000 -0500
+@@ -766,7 +766,6 @@
  X_GCH_STATIC
  X_GCH_FLAGS
@@ -30 +30 @@
  PROJECT_repo_type
  PROJECT_repo_date
-@@ -14149,18 +14148,6 @@
-        CXXFLAGS="$CXXFLAGS_GGDB3"
+@@ -14505,24 +14504,6 @@
  fi
  
--###############################################################################
+ ###############################################################################
 -# additional ldflags
 -###############################################################################
@@ -42 +41 @@
 -        X_libmp4v2_la_LDFLAGS='-Wl,-current_version,$(PROJECT_version_major).$(PROJECT_version_minor).$(PROJECT_version_point) -Wl,-compatibility_version,$(PROJECT_version_major).0.0'
 -        ;;
+-    *-*-cygwin*)
+-        X_libmp4v2_la_LDFLAGS='-no-undefined'
+-        ;;
 -    *)
 -        X_libmp4v2_la_LDFLAGS=
 -        ;;
 -esac
+-
+-
+-
+-###############################################################################
+ # check for --disable-fvisibility
+ ###############################################################################
  
- 
-