libmatroska: Update to 1.4.2
This commit is contained in:
11
mingw-w64-libmatroska/001-ebml-ldflags.patch
Normal file
11
mingw-w64-libmatroska/001-ebml-ldflags.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- libmatroska-1.4.2/Makefile.am.orig 2015-01-06 23:24:53.694200000 +0300
|
||||
+++ libmatroska-1.4.2/Makefile.am 2015-01-06 23:25:34.880200000 +0300
|
||||
@@ -26,7 +26,7 @@
|
||||
src/KaxSemantic.cpp \
|
||||
src/KaxTracks.cpp \
|
||||
src/KaxVersion.cpp
|
||||
-libmatroska_la_LDFLAGS = -version-info 6:0:0 -no-undefined
|
||||
+libmatroska_la_LDFLAGS = -version-info 6:0:0 -no-undefined $(EBML_LIBS)
|
||||
|
||||
nobase_include_HEADERS = \
|
||||
matroska/c/libmatroska.h \
|
||||
@@ -1,67 +0,0 @@
|
||||
--- libmatroska-1.4.1/make/mingw32/Makefile.orig 2013-09-17 22:15:34.000000000 +0500
|
||||
+++ libmatroska-1.4.1/make/mingw32/Makefile 2014-09-25 13:46:28.214600000 +0500
|
||||
@@ -9,12 +9,19 @@
|
||||
# Compile with debug information?
|
||||
#DEBUG = yes
|
||||
|
||||
+prefix=/mingw
|
||||
+bindir=$(prefix)/bin
|
||||
+libdir=$(prefix)/lib
|
||||
+includedir=$(prefix)/include/matroska
|
||||
+
|
||||
# Where libebml resides
|
||||
EBML_DIR = ../../../libebml
|
||||
|
||||
# Has libebml been compiled as a DLL?
|
||||
EBML_DLL = yes
|
||||
|
||||
+LIBEBML_INCLUDE_DIR=../../../libebml
|
||||
+INCLUDE_DIR=../../matroska
|
||||
#
|
||||
# Don't change anything below this line.
|
||||
#
|
||||
@@ -27,6 +34,11 @@
|
||||
WINDRES = $(CROSS)windres
|
||||
RANLIB = $(CROSS)ranlib
|
||||
AR = $(CROSS)ar
|
||||
+INSTALL = install
|
||||
+INSTALL_OPTS = -m 644
|
||||
+INSTALL_OPTS_LIB = -m 644
|
||||
+INSTALL_DIR_OPTS = -m 755
|
||||
+
|
||||
RES =
|
||||
SRC = $(wildcard ../../src/*.cpp)
|
||||
OBJ = $(patsubst %.cpp,%.o,$(SRC))
|
||||
@@ -104,6 +116,32 @@
|
||||
$(CXX) $(COMPILEFLAGS) -MM -MT $$o $$i >> .depend ; \
|
||||
done
|
||||
|
||||
+ifeq (yes,$(SHARED))
|
||||
+install: install_sharedlib install_headers
|
||||
+else
|
||||
+install: install_staticlib install_headers
|
||||
+endif
|
||||
+
|
||||
+install_headers:
|
||||
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
|
||||
+ for i in $(INCLUDE_DIR)/*.h; do \
|
||||
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
|
||||
+ done
|
||||
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
|
||||
+ for i in $(INCLUDE_DIR)/c/*.h; do \
|
||||
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
|
||||
+ done
|
||||
+
|
||||
+install_staticlib: $(LIBS)
|
||||
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
|
||||
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBS) $(DESTDIR)$(libdir)
|
||||
+
|
||||
+install_sharedlib: $(LIBS)
|
||||
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(bindir)
|
||||
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
|
||||
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBS) $(DESTDIR)$(bindir)
|
||||
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBS).a $(DESTDIR)$(libdir)
|
||||
+
|
||||
#
|
||||
# include dependency files if they exist
|
||||
#
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
_realname=libmatroska
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
|
||||
pkgver=1.4.1
|
||||
pkgver=1.4.2
|
||||
pkgrel=1
|
||||
pkgdesc="Matroska library (mingw-w64)"
|
||||
arch=('any')
|
||||
@@ -10,24 +10,34 @@ groups=("${MINGW_PACKAGE_PREFIX}")
|
||||
license=('LGPL')
|
||||
url="http://dl.matroska.org/downloads/libebml/"
|
||||
depends=("${MINGW_PACKAGE_PREFIX}-libebml")
|
||||
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "automake" "autoconf")
|
||||
options=('staticlibs')
|
||||
source=("http://dl.matroska.org/downloads/${_realname}/${_realname}-${pkgver}.tar.bz2"
|
||||
001-makefile.patch)
|
||||
md5sums=('f61b2e5086f4bb9d24a43cc8af43a719'
|
||||
'3c86865729825b06bb3e00a14f1674e7')
|
||||
001-ebml-ldflags.patch)
|
||||
md5sums=('f8fe42003e072a42a19ed40405f9efdb'
|
||||
'f02191d9d009d82d80985e4079eff266')
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/${_realname}-${pkgver}
|
||||
patch -p1 -i ${srcdir}/001-makefile.patch
|
||||
patch -p1 -i ${srcdir}/001-ebml-ldflags.patch
|
||||
|
||||
autoreconf -fiv
|
||||
}
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/${_realname}-${pkgver}/make/mingw32
|
||||
|
||||
mkdir -p "${srcdir}/build-${MINGW_CHOST}"
|
||||
cd "${srcdir}/build-${MINGW_CHOST}"
|
||||
"${srcdir}"/${_realname}-${pkgver}/configure \
|
||||
--prefix=${MINGW_PREFIX} \
|
||||
--build=${MINGW_CHOST} \
|
||||
--host=${MINGW_CHOST} \
|
||||
--enable-shared \
|
||||
--enable-static
|
||||
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd ${srcdir}/${_realname}-${pkgver}/make/mingw32
|
||||
make install prefix="${pkgdir}${MINGW_PREFIX}"
|
||||
cd "${srcdir}/build-${MINGW_CHOST}"
|
||||
make install DESTDIR="${pkgdir}"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user