Update to libebml-1.3.1.

from brad (maintainer)
This commit is contained in:
ajacoutot 2015-05-27 21:16:51 +00:00
parent a7f5ec6782
commit a543f195d3
4 changed files with 12 additions and 70 deletions

View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.11 2015/03/16 18:07:56 naddy Exp $
# $OpenBSD: Makefile,v 1.12 2015/05/27 21:16:51 ajacoutot Exp $
COMMENT= Extensible Binary Meta Language library
DISTNAME= libebml-1.2.2
DISTNAME= libebml-1.3.1
CATEGORIES= textproc
MASTER_SITES= http://dl.matroska.org/downloads/libebml/
EXTRACT_SUFX= .tar.bz2
REVISION= 0
SHARED_LIBS= ebml 2.1
SHARED_LIBS= ebml 3.0
HOMEPAGE= http://www.matroska.org/
@ -19,17 +18,8 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB= m stdc++
MAKE_ENV+= LIBebml_VERSION=${LIBebml_VERSION}
MAKE_FLAGS+= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
FAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
USE_GMAKE= Yes
NO_TEST= Yes
WRKSRC= ${WRKDIST}/make/linux
post-extract:
@perl -pi -e 's/\r\n/\n/;' ${WRKSRC}/Makefile
USE_LIBTOOL= gnu
CONFIGURE_STYLE= gnu
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (libebml-1.2.2.tar.bz2) = R2sIxkNqlsAkpT54jnyUXOm0HNhlQWV2NESqflJFt6U=
SIZE (libebml-1.2.2.tar.bz2) = 60802
SHA256 (libebml-1.3.1.tar.bz2) = GViUsxqspVZXybwVfXRPI7DCVZdga5fPpakDnEtoQpU=
SIZE (libebml-1.3.1.tar.bz2) = 599116

View File

@ -1,52 +0,0 @@
$OpenBSD: patch-make_linux_Makefile,v 1.6 2011/03/12 21:16:42 jakemsr Exp $
--- make/linux/Makefile.orig Sun Feb 27 00:45:11 2011
+++ make/linux/Makefile Sun Feb 27 00:46:43 2011
@@ -48,8 +48,7 @@ LIBS=
# Names
LIBRARY=libebml.a
-LIBRARY_SO=libebml.so
-LIBRARY_SO_VER=libebml.so.3
+LIBRARY_SO_VER=libebml.so.${LIBebml_VERSION}
# source-files
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
@@ -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)
- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
- rm -f $(LIBRARY_SO)
- ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
+$(LIBRARY_SO_VER): $(objects_so)
+ $(CXX) -shared -fPIC -o $(LIBRARY_SO_VER) $(objects_so)
clean:
rm -f $(objects) $(objects_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 -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
ifneq ($(wildcard .depend),)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2015/03/16 18:07:56 naddy Exp $
@comment $OpenBSD: PLIST,v 1.3 2015/05/27 21:16:51 ajacoutot Exp $
include/ebml/
include/ebml/Debug.h
include/ebml/EbmlBinary.h
@ -24,8 +24,12 @@ include/ebml/EbmlVersion.h
include/ebml/EbmlVoid.h
include/ebml/IOCallback.h
include/ebml/MemIOCallback.h
include/ebml/MemReadIOCallback.h
include/ebml/SafeReadIOCallback.h
include/ebml/StdIOCallback.h
include/ebml/c/
include/ebml/c/libebml_t.h
lib/libebml.a
lib/libebml.la
@lib lib/libebml.so.${LIBebml_VERSION}
lib/pkgconfig/libebml.pc