[135612] trunk/dports/multimedia/libmatroska

[ryandesign at macports.org]

Revision: 135612
          https://trac.macports.org/changeset/135612
Author:   ryandesign at macports.org
Date:     2015-04-27 20:24:15 -0700 (Mon, 27 Apr 2015)
Log Message:
-----------
libmatroska: update to 1.4.2

Modified Paths:
--------------
    trunk/dports/multimedia/libmatroska/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/libmatroska/files/
    trunk/dports/multimedia/libmatroska/files/patch-Makefile.in.diff

Modified: trunk/dports/multimedia/libmatroska/Portfile
===================================================================
--- trunk/dports/multimedia/libmatroska/Portfile	2015-04-28 03:17:47 UTC (rev 135611)
+++ trunk/dports/multimedia/libmatroska/Portfile	2015-04-28 03:24:15 UTC (rev 135612)
@@ -4,10 +4,11 @@
 PortSystem          1.0
 
 name                libmatroska
-version             1.4.1
+version             1.4.2
 categories          multimedia
-license             LGPL-2+
 maintainers         ryandesign openmaintainer
+license             LGPL-2.1+
+
 description         Matroska is an extensible open standard audio/video container format.
 long_description    \
                     Matroska is an extensible open standard audio/video container \
@@ -19,39 +20,18 @@
 master_sites        http://dl.matroska.org/downloads/${name}/
 use_bzip2           yes
 
-checksums           rmd160  5074e5b3005ab6c12261bd0cfa2ce51bd271de78 \
-                    sha256  086f21873e925679babdabf793c3bb85c353d0cd79423543a3355e08e8a4efb7
+checksums           rmd160  5db92e3c4a32cc5772cabfc85e4d3ecbf8870bdf \
+                    sha256  bea10320f1f1fd121bbd7db9ffc77b2518e8269f00903549c5425478bbf8393f
 
-depends_build       port:libebml
+depends_build       port:pkgconfig
 
-post-extract {
-    copy ${worksrcpath}/make/linux ${worksrcpath}/make/darwin
-}
+depends_lib         port:libebml
 
-use_configure       no
+patchfiles          patch-Makefile.in.diff
 
-variant universal {}
-
-set cxx_stdlibflags {}
-if {[string match *clang* ${configure.cxx}]} {
-    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
-}
-
-build.dir           ${worksrcpath}/make/darwin
-build.args          prefix=${prefix} \
-                    CXX=${configure.cxx} \
-                    CXXFLAGS="[get_canonical_archflags cxx] ${cxx_stdlibflags}" \
-                    LIBEBML_INCLUDE_DIR=${prefix}/include \
-                    LIBEBML_LIB_DIR=${prefix}/lib
-
 test.run            yes
-test.cmd            ./test6 && ./test8 && ./test9
-test.target
+test.target         check
 
-# We need -p for install because ld will ask for ranlib if the modification date changes.
-destroot.args       INSTALL_OPTS_LIB='-m 644 -p'
-destroot.destdir    prefix=${destroot}${prefix}
-
 livecheck.type      regex
 livecheck.url       [lindex ${master_sites} 0]
 livecheck.regex     >${name}-(\[0-9.\]+)${extract.suffix}

Added: trunk/dports/multimedia/libmatroska/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/multimedia/libmatroska/files/patch-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/multimedia/libmatroska/files/patch-Makefile.in.diff	2015-04-28 03:24:15 UTC (rev 135612)
@@ -0,0 +1,32 @@
+Actually link against libebml
+https://github.com/Matroska-Org/libmatroska/pull/5
+https://github.com/Matroska-Org/libmatroska/commit/81edf95a02cf3a861135a134889f2d61b886229a
+https://github.com/Matroska-Org/libmatroska/commit/9466bf5f2b7e63d2e93549d239a7e0b0060ce635
+--- Makefile.in.orig	2015-01-04 08:07:12.000000000 -0600
++++ Makefile.in	2015-04-27 22:11:40.000000000 -0500
+@@ -141,7 +141,8 @@
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
+ 	"$(DESTDIR)$(includedir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libmatroska_la_LIBADD =
++am__DEPENDENCIES_1 =
++libmatroska_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am__dirstamp = $(am__leading_dot)dirstamp
+ am_libmatroska_la_OBJECTS = src/FileKax.lo src/KaxAttached.lo \
+ 	src/KaxAttachments.lo src/KaxBlock.lo src/KaxBlockData.lo \
+@@ -285,6 +286,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+ MKDIR_P = @MKDIR_P@
+@@ -387,6 +389,7 @@
+ 	src/KaxVersion.cpp
+ 
+ libmatroska_la_LDFLAGS = -version-info 6:0:0 -no-undefined
++libmatroska_la_LIBADD = $(EBML_LIBS)
+ nobase_include_HEADERS = \
+ 	matroska/c/libmatroska.h \
+ 	matroska/c/libmatroska_t.h \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150427/ce1ba14a/attachment.html>