cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.0.0, from Brad (taking maintainer)

Browse Source
This commit is contained in:
sthen 2010-06-18 21:34:56 +00:00
parent 6a40d723f3
commit 32f8d596c5
6 changed files with 135 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
multimedia/libmatroska/Makefile
View File

@ -1,28 +1,38 @@
# $OpenBSD: Makefile,v 1.4 2007/09/16 03:24:28 merdely Exp $
# $OpenBSD: Makefile,v 1.5 2010/06/18 21:35:18 sthen Exp $
COMMENT= extensible open standard audio/video container library
DISTNAME= libmatroska-0.8.1
SHARED_LIBS= matroska 0.0
EXTRACT_SUFX= .tar.bz2
DISTNAME= libmatroska-1.0.0
CATEGORIES= multimedia
MASTER_SITES= http://dl.matroska.org/downloads/libmatroska/
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= matroska 1.0
HOMEPAGE= http://www.matroska.org/
# LGPL
MAINTAINER= Brad Smith <brad@comstyle.com>
# LGPLv2.1+
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
WANTLIB= m stdc++
LIB_DEPENDS= ebml::textproc/libebml
LIB_DEPENDS= ebml.>=1::textproc/libebml
MAKE_ENV+= LIBmatroska_VERSION=${LIBmatroska_VERSION}
MAKE_FLAGS+= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LOCALBASE=${LOCALBASE}
FAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
USE_GMAKE= Yes
NO_REGRESS= Yes
USE_GMAKE= Yes
WRKSRC= ${WRKDIST}/make/linux
FAKE_FLAGS+= LIBmatroska_VERSION=${LIBmatroska_VERSION}
MAKE_FLAGS+= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LOCALBASE=${LOCALBASE}
post-extract:
@perl -pi -e 's/\r\n/\n/;' ${WRKSRC}/Makefile
.include <bsd.port.mk>

10
multimedia/libmatroska/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libmatroska-0.8.1.tar.bz2) = IM9iSs4MWKVMd1Luv7wLGQ==
RMD160 (libmatroska-0.8.1.tar.bz2) = GVyl/PSGU/6lbkLOQHTRZEfGgKw=
SHA1 (libmatroska-0.8.1.tar.bz2) = gxfDoqGfJ6BcXdKJw0lsIaHRJFY=
SHA256 (libmatroska-0.8.1.tar.bz2) = RM//U9Yk8R3Kgt00mJgSUlzS7wzfpVnfDJPyIXUxmhw=
SIZE (libmatroska-0.8.1.tar.bz2) = 91381
MD5 (libmatroska-1.0.0.tar.bz2) = TvzzlFsXpvAyDPGqoyak3g==
RMD160 (libmatroska-1.0.0.tar.bz2) = +246d1+mEcv7qz8XijFwy2VE1R4=
SHA1 (libmatroska-1.0.0.tar.bz2) = H1gheWiggb1VDsBvLWvrgaejrGg=
SHA256 (libmatroska-1.0.0.tar.bz2) = 3AAFI99QjkV+rWRHstmixUn7/1JXg8E6ltGbvWETe4g=
SIZE (libmatroska-1.0.0.tar.bz2) = 83282

83
multimedia/libmatroska/patches/patch-make_linux_Makefile
View File

@ -1,22 +1,7 @@
$OpenBSD: patch-make_linux_Makefile,v 1.2 2007/03/21 12:00:29 ajacoutot Exp $
--- make/linux/Makefile.orig Mon Mar 19 13:40:09 2007
+++ make/linux/Makefile Mon Mar 19 13:42:43 2007
@@ -16,11 +16,11 @@ prefix=/boot/home/config
else
prefix=/usr/local
endif
-libdir=$(prefix)/lib
-includedir=$(prefix)/include/matroska
+libdir=$(PREFIX)/lib
+includedir=$(PREFIX)/include/matroska
# Programs
-CXX=g++
+#CXX=g++
LD=$(CXX)
AR = ar rcvu
RANLIB = ranlib
@@ -36,8 +36,8 @@ endif
$OpenBSD: patch-make_linux_Makefile,v 1.3 2010/06/18 21:35:18 sthen Exp $
--- make/linux/Makefile.orig Thu Jun 17 21:05:53 2010
+++ make/linux/Makefile Thu Jun 17 21:06:58 2010
@@ -33,8 +33,8 @@ INSTALL_DIR_OPTS = -m 755
CWD=$(shell pwd)
# Options
@ -27,28 +12,72 @@ $OpenBSD: patch-make_linux_Makefile,v 1.2 2007/03/21 12:00:29 ajacoutot Exp $
EXTENSION=.cpp
ifeq (yes,$(DEBUG))
@@ -57,7 +57,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV)
@@ -53,8 +53,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV)
# Names
LIBRARY=libmatroska.a
LIBRARY_SO=libmatroska.so
-LIBRARY_SO_VER=libmatroska.so.0
-LIBRARY_SO=libmatroska.so
-LIBRARY_SO_VER=libmatroska.so.2
+LIBRARY_SO_VER=libmatroska.so.$(LIBmatroska_VERSION)
# source-files
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
@@ -102,9 +102,7 @@ $(LIBRARY): $(objects)
@@ -81,7 +80,7 @@ endif
staticlib: $(LIBRARY)
-sharedlib: $(LIBRARY_SO)
+sharedlib: $(LIBRARY_SO_VER)
lib:
@echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
@@ -98,15 +97,12 @@ $(LIBRARY): $(objects)
$(AR) rcvu $@ $(objects)
$(RANLIB) $@
$(LIBRARY_SO): $(objects_so)
-$(LIBRARY_SO): $(objects_so)
- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
- rm -f $(LIBRARY_SO)
- ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
+ $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) $(LINKFLAGS) -lebml
+$(LIBRARY_SO_VER): $(objects_so)
+ $(CXX) -shared -fPIC -o $(LIBRARY_SO_VER) $(objects_so) $(LINKFLAGS) -lebml
clean: cleantest
rm -f $(objects) $(objects_so)
@@ -172,7 +170,6 @@ install_staticlib: $(LIBRARY)
install_sharedlib: $(LIBRARY_SO)
rm -f $(LIBRARY)
- rm -f $(LIBRARY_SO)
rm -f $(LIBRARY_SO_VER)
rm -f CORE
@@ -128,19 +124,19 @@ depend:
test: test6 test9
-test6: test6.o $(LIBRARY) $(LIBRARY_SO)
+test6: test6.o $(LIBRARY) $(LIBRARY_SO_VER)
$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
test6.o: $(MUX_SRC_DIR)test6.cpp
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
-test8: test8.o $(LIBRARY) $(LIBRARY_SO)
+test8: test8.o $(LIBRARY) $(LIBRARY_SO_VER)
$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
test8.o: $(MUX_SRC_DIR)test8.cpp
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
-test9: test9.o $(LIBRARY) $(LIBRARY_SO)
+test9: test9.o $(LIBRARY) $(LIBRARY_SO_VER)
$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
test9.o: $(TAG_SRC_DIR)test9.cpp
@@ -166,10 +162,9 @@ install_staticlib: $(LIBRARY)
$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
-install_sharedlib: $(LIBRARY_SO)
+install_sharedlib: $(LIBRARY_SO_VER)
$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)

27
textproc/libebml/Makefile
View File

@ -1,29 +1,36 @@
# $OpenBSD: Makefile,v 1.6 2010/06/04 19:57:08 kili Exp $
# $OpenBSD: Makefile,v 1.7 2010/06/18 21:34:56 sthen Exp $
COMMENT= Extensible Binary Meta Language library
DISTNAME= libebml-0.7.7
PKGNAME= ${DISTNAME}p0
SHARED_LIBS= ebml 0.0
EXTRACT_SUFX= .tar.bz2
DISTNAME= libebml-1.0.0
CATEGORIES= textproc
MASTER_SITES= http://dl.matroska.org/downloads/libebml/
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= ebml 1.0
HOMEPAGE= http://www.matroska.org/
# LGPLv2.1
MAINTAINER= Brad Smith <brad@comstyle.com>
# LGPLv2.1+
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
WANTLIB= m stdc++
NO_REGRESS= Yes
MAKE_ENV+= LIBebml_VERSION=${LIBebml_VERSION}
MAKE_FLAGS+= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
FAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
USE_GMAKE= Yes
NO_REGRESS= Yes
WRKSRC= ${WRKDIST}/make/linux
MAKE_FLAGS+= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
LIBebml_VERSION=${LIBebml_VERSION}
post-extract:
@perl -pi -e 's/\r\n/\n/;' ${WRKSRC}/Makefile
.include <bsd.port.mk>

10
textproc/libebml/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libebml-0.7.7.tar.bz2) = fIRWpQ/YLByXVZF9AYLEng==
RMD160 (libebml-0.7.7.tar.bz2) = 1C7GYGoWzJs4z/UB4UkphTE2+gs=
SHA1 (libebml-0.7.7.tar.bz2) = 55+YloyFZslWN2FsRBlpfgrb7Mo=
SHA256 (libebml-0.7.7.tar.bz2) = FeN60u5FU7sCBvuJbHznzexr/Xzb4sHwefeTNUpWodY=
SIZE (libebml-0.7.7.tar.bz2) = 56527
MD5 (libebml-1.0.0.tar.bz2) = bUOPA9iSjYOi0SDtAnBfAw==
RMD160 (libebml-1.0.0.tar.bz2) = kyVSriOQByU/BSbYuw1QZ3bKFN8=
SHA1 (libebml-1.0.0.tar.bz2) = i3l1LdtsrasDRrQ3hUMsVU2/Ig0=
SHA256 (libebml-1.0.0.tar.bz2) = ckgN7HNs1d9byejDhkpY0XcVVCyD/xsgldykbMG4sXg=
SIZE (libebml-1.0.0.tar.bz2) = 60058

58
textproc/libebml/patches/patch-make_linux_Makefile
View File

@ -1,48 +1,52 @@
$OpenBSD: patch-make_linux_Makefile,v 1.4 2007/01/04 20:56:43 steven Exp $
--- make/linux/Makefile.orig Thu Mar 30 21:05:11 2006
+++ make/linux/Makefile Thu Jan 4 21:58:05 2007
@@ -16,11 +16,11 @@ prefix=/boot/home/config
else
prefix=/usr/local
endif
-libdir=$(prefix)/lib
-includedir=$(prefix)/include/ebml
+libdir=$(PREFIX)/lib
+includedir=$(PREFIX)/include/ebml
# Programs
-CXX=g++
+#CXX=g++
LD=$(CXX)
AR = ar rcvu
RANLIB = ranlib
@@ -51,8 +51,8 @@ LIBS=
$OpenBSD: patch-make_linux_Makefile,v 1.5 2010/06/18 21:34:56 sthen Exp $
--- make/linux/Makefile.orig Thu Jun 17 20:58:09 2010
+++ make/linux/Makefile Thu Jun 17 21:00:26 2010
@@ -48,8 +48,7 @@ LIBS=
# Names
LIBRARY=libebml.a
-LIBRARY_SO=libebml.so
-LIBRARY_SO_VER=libebml.so.0
-LIBRARY_SO_VER=libebml.so.2
+LIBRARY_SO_VER=libebml.so.${LIBebml_VERSION}
+LIBRARY_SO=${LIBRARY_SO_VER}
# source-files
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
@@ -94,9 +94,7 @@ $(LIBRARY): $(objects)
@@ -73,7 +72,7 @@ endif
staticlib: $(LIBRARY)
-sharedlib: $(LIBRARY_SO)
+sharedlib: $(LIBRARY_SO_VER)
lib:
@echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
@@ -90,15 +89,12 @@ $(LIBRARY): $(objects)
$(AR) rcvu $@ $(objects)
$(RANLIB) $@
$(LIBRARY_SO): $(objects_so)
-$(LIBRARY_SO): $(objects_so)
- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
- rm -f $(LIBRARY_SO)
- ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
+ $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -fPIC
+$(LIBRARY_SO_VER): $(objects_so)
+ $(CXX) -shared -fPIC -o $(LIBRARY_SO_VER) $(objects_so)
clean:
rm -f $(objects) $(objects_so)
@@ -141,7 +139,6 @@ install_staticlib: $(LIBRARY)
install_sharedlib: $(LIBRARY_SO)
rm -f $(LIBRARY)
- rm -f $(LIBRARY_SO)
rm -f $(LIBRARY_SO_VER)
rm -f CORE
@@ -135,10 +131,9 @@ install_staticlib: $(LIBRARY)
$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
-install_sharedlib: $(LIBRARY_SO)
+install_sharedlib: $(LIBRARY_SO_VER)
$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
- ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
ifneq ($(wildcard .depend),)