summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorEmanuel Haupt <ehaupt@FreeBSD.org>2013-05-06 22:48:45 +0000
committerEmanuel Haupt <ehaupt@FreeBSD.org>2013-05-06 22:48:45 +0000
commit9b28e8c4dab8a2d543a0474f695eeeb631f9f585 (patch)
tree422995fd69f2866071da3ffea21d399cf8a7ac89 /multimedia
parentUpdate to 1.3.0 (diff)
- Update to 1.4.0
- Add LICENSE - Remove CR/LF from patch Approved by: multimedia (bapt, kwm)
Notes
Notes: svn path=/head/; revision=317560
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/libmatroska/Makefile15
-rw-r--r--multimedia/libmatroska/distinfo4
-rw-r--r--multimedia/libmatroska/files/patch-make_linux_Makefile16
-rw-r--r--multimedia/libmatroska/pkg-plist2
4 files changed, 18 insertions, 19 deletions
diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
index 8c02d0a3ed76..02ee7f185f15 100644
--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: libmatroska
-# Date created: Mon May 19 08:29:44 UTC 2003
-# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= libmatroska
-PORTVERSION= 1.3.0
+PORTVERSION= 1.4.0
CATEGORIES= multimedia audio
MASTER_SITES= http://dl.matroska.org/downloads/libmatroska/ \
http://www.bunkus.org/videotools/mkvtoolnix/sources/
@@ -14,11 +10,14 @@ MASTER_SITES= http://dl.matroska.org/downloads/libmatroska/ \
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Extensible Multimedia Container Format
-BUILD_DEPENDS= libebml>=1.2.1:${PORTSDIR}/textproc/libebml
-LIB_DEPENDS= ebml.3:${PORTSDIR}/textproc/libebml
+LICENSE= LGPL21
+
+BUILD_DEPENDS= libebml>=1.3.0:${PORTSDIR}/textproc/libebml
+LIB_DEPENDS= ebml.4:${PORTSDIR}/textproc/libebml
USE_BZIP2= yes
USE_GMAKE= yes
+USE_DOS2UNIX= make/linux/Makefile
BUILD_WRKSRC= ${WRKSRC}/make/linux
INSTALL_WRKSRC= ${WRKSRC}/make/linux
USE_LDCONFIG= yes
diff --git a/multimedia/libmatroska/distinfo b/multimedia/libmatroska/distinfo
index 284fc4d933c0..8fbcb1796fd7 100644
--- a/multimedia/libmatroska/distinfo
+++ b/multimedia/libmatroska/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmatroska-1.3.0.tar.bz2) = 5231ec958571365e719a6fd3c220227af6cf0f14e0bd1bcf766ddbc068d18e69
-SIZE (libmatroska-1.3.0.tar.bz2) = 80542
+SHA256 (libmatroska-1.4.0.tar.bz2) = 1b6d02e75cdbfb6d282dcf2a902a259c3075404885d5e8063e6652a2b3f6c11b
+SIZE (libmatroska-1.4.0.tar.bz2) = 78705
diff --git a/multimedia/libmatroska/files/patch-make_linux_Makefile b/multimedia/libmatroska/files/patch-make_linux_Makefile
index a388a9056756..4ca4d2d466c8 100644
--- a/multimedia/libmatroska/files/patch-make_linux_Makefile
+++ b/multimedia/libmatroska/files/patch-make_linux_Makefile
@@ -1,11 +1,11 @@
--- make/linux/Makefile.orig 2010-03-23 12:58:04.000000000 -0300
+++ make/linux/Makefile 2010-05-31 15:03:28.000000000 -0300
@@ -99,7 +99,7 @@
- $(RANLIB) $@
-
- $(LIBRARY_SO): $(objects_so)
-- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
-+ $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -L$(LIBEBML_LIB_DIR) -lebml
- rm -f $(LIBRARY_SO)
- ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
-
+ $(RANLIB) $@
+
+ $(LIBRARY_SO): $(objects_so)
+- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
++ $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -L$(LIBEBML_LIB_DIR) -lebml
+ rm -f $(LIBRARY_SO)
+ ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
+
diff --git a/multimedia/libmatroska/pkg-plist b/multimedia/libmatroska/pkg-plist
index 09d963cea94b..97e0715ebcba 100644
--- a/multimedia/libmatroska/pkg-plist
+++ b/multimedia/libmatroska/pkg-plist
@@ -28,6 +28,6 @@ include/matroska/KaxVersion.h
include/matroska/c/libmatroska.h
include/matroska/c/libmatroska_t.h
lib/libmatroska.so
-lib/libmatroska.so.5
+lib/libmatroska.so.6
@dirrm include/matroska/c
@dirrm include/matroska