mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
libebml: upgrade 1.3.0 -> 1.4.4
Changelog: https://github.com/Matroska-Org/libebml/blob/master/NEWS.md Signed-off-by: alperak <alperyasinak1@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
f3d3bc7620
commit
7d1a0cd654
|
|
@ -1,57 +0,0 @@
|
|||
Use LD and obey LDFLAGS
|
||||
|
||||
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
|
||||
Upstream-Status: Pending
|
||||
|
||||
diff --git a/make/linux/Makefile b/make/linux/Makefile
|
||||
index 391b6e3..a2ac13e 100644
|
||||
--- a/make/linux/Makefile
|
||||
+++ b/make/linux/Makefile
|
||||
@@ -64,6 +64,7 @@ objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
|
||||
WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
|
||||
COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
|
||||
DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE)
|
||||
+LINKFLAGS=$(LDFLAGS)
|
||||
|
||||
ifeq (Darwin,$(shell uname -s))
|
||||
all: staticlib
|
||||
@@ -91,7 +92,7 @@ $(LIBRARY): $(objects)
|
||||
$(RANLIB) $@
|
||||
|
||||
$(LIBRARY_SO): $(objects_so)
|
||||
- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
|
||||
+ $(LD) $(LINKFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
|
||||
rm -f $(LIBRARY_SO)
|
||||
ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
|
||||
|
||||
diff --git a/make/mingw32/Makefile b/make/mingw32/Makefile
|
||||
index e5986ef..6ca16aa 100644
|
||||
--- a/make/mingw32/Makefile
|
||||
+++ b/make/mingw32/Makefile
|
||||
@@ -18,6 +18,7 @@ DEBUGFLAGS=-g -DDEBUG
|
||||
endif
|
||||
CROSS =
|
||||
CXX = $(CROSS)g++
|
||||
+LD = $(CXX)
|
||||
CC = $(CROSS)gcc
|
||||
WINDRES = $(CROSS)windres
|
||||
RANLIB = $(CROSS)ranlib
|
||||
@@ -33,6 +34,7 @@ LIBS = libebml.a
|
||||
endif
|
||||
INCS = -I"$(shell pwd)/../.."
|
||||
COMPILEFLAGS = $(DEBUGFLAGS) $(INCS) $(DLLFLAGS) $(CXXFLAGS)
|
||||
+LINKFLAGS = $(LDFLAGS)
|
||||
|
||||
.PHONY: all all-before all-after clean clean-custom
|
||||
|
||||
@@ -54,7 +56,7 @@ libebml.a: $(OBJ)
|
||||
$(RANLIB) $@
|
||||
|
||||
libebml.dll: $(OBJ)
|
||||
- $(CXX) -shared -Wl,--export-all -Wl,--out-implib=$@.a -o $@ $(OBJ)
|
||||
+ $(LD) $(LINKFLAGS) -shared -Wl,--export-all -Wl,--out-implib=$@.a -o $@ $(OBJ)
|
||||
|
||||
depend:
|
||||
@echo Calculating dependecies:
|
||||
--
|
||||
2.8.0
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
Allow override of the 'uname -s' for cross-compilation
|
||||
|
||||
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
|
||||
Upstream-Status: Pending
|
||||
|
||||
diff --git a/make/linux/Makefile b/make/linux/Makefile
|
||||
index a2ac13e..4188bee 100644
|
||||
--- a/make/linux/Makefile
|
||||
+++ b/make/linux/Makefile
|
||||
@@ -9,9 +9,11 @@
|
||||
# 'make DEBUG=yes'.
|
||||
#
|
||||
|
||||
+TARGET_OS ?= $(shell uname -s)
|
||||
+
|
||||
# Paths
|
||||
# BeOS wants the libs and headers in /boot/home/config
|
||||
-ifeq (BeOS,$(shell uname -s))
|
||||
+ifeq (BeOS,$(TARGET_OS))
|
||||
prefix=/boot/home/config
|
||||
else
|
||||
prefix=/usr/local
|
||||
@@ -66,7 +68,7 @@ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
|
||||
DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE)
|
||||
LINKFLAGS=$(LDFLAGS)
|
||||
|
||||
-ifeq (Darwin,$(shell uname -s))
|
||||
+ifeq (Darwin,$(TARGET_OS))
|
||||
all: staticlib
|
||||
else
|
||||
all: staticlib sharedlib
|
||||
@@ -116,7 +118,7 @@ depend:
|
||||
$(CXX) $(DEPENDFLAGS) -MM -MT $$o $$i >> .depend ; \
|
||||
done
|
||||
|
||||
-ifeq (Darwin,$(shell uname -s))
|
||||
+ifeq (Darwin,$(TARGET_OS))
|
||||
install: install_staticlib install_headers
|
||||
else
|
||||
install: install_staticlib install_sharedlib install_headers
|
||||
--
|
||||
2.8.0
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
SUMMARY = "libebml is a C++ libary to parse EBML files"
|
||||
LICENSE = "LGPL-2.1-only"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=7fbc338309ac38fefcd64b04bb903e34"
|
||||
|
||||
SRC_URI = "\
|
||||
http://dl.matroska.org/downloads/libebml/libebml-${PV}.tar.bz2 \
|
||||
file://ldflags.patch \
|
||||
file://override-uname.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "efec729bf5a51e649e1d9d1f61c0ae7a"
|
||||
SRC_URI[sha256sum] = "83b074d6b62715aa0080406ea84d33df2e44b5d874096640233a4db49b8096de"
|
||||
|
||||
inherit dos2unix
|
||||
|
||||
LIBEBML_OS = "Unknown"
|
||||
LIBEBML_OS_linux = "Linux"
|
||||
LIBEBML_OS:darwin = "Darwin"
|
||||
LIBEBML_OS:mingw32 = "Windows"
|
||||
|
||||
EXTRA_OEMAKE = "\
|
||||
'TARGET_OS=${LIBEBML_OS}' \
|
||||
\
|
||||
'CXX=${CXX}' \
|
||||
'LD=${CXX}' \
|
||||
'AR=${AR}' \
|
||||
'RANLIB=${RANLIB}' \
|
||||
\
|
||||
'DEBUGFLAGS=' \
|
||||
'CPPFLAGS=${CPPFLAGS}' \
|
||||
'CXXFLAGS=${CXXFLAGS}' \
|
||||
'LDFLAGS=${LDFLAGS}' \
|
||||
\
|
||||
'prefix=${prefix}' \
|
||||
'libdir=${libdir}' \
|
||||
'includedir=${includedir}/ebml' \
|
||||
"
|
||||
|
||||
do_compile () {
|
||||
oe_runmake -C make/linux
|
||||
}
|
||||
|
||||
do_install() {
|
||||
cd ${S}/make/linux
|
||||
|
||||
install -d ${D}${libdir}
|
||||
install -m 0644 libebml.a ${D}${libdir}
|
||||
install -m 0755 libebml.so.* ${D}${libdir}
|
||||
cp -R --no-dereference --preserve=mode,links -v libebml.so ${D}${libdir}
|
||||
|
||||
install -d ${D}${includedir}/ebml
|
||||
for i in ../../ebml/*.h; do
|
||||
install -m 0644 $i ${D}${includedir}/ebml
|
||||
done
|
||||
|
||||
install -d ${D}${includedir}/ebml/c
|
||||
for i in ../../ebml/c/*.h; do
|
||||
install -m 0644 $i ${D}${includedir}/ebml/c
|
||||
done
|
||||
}
|
||||
15
meta-multimedia/recipes-mkv/libebml/libebml_1.4.4.bb
Normal file
15
meta-multimedia/recipes-mkv/libebml/libebml_1.4.4.bb
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
SUMMARY = "C++ library to parse EBML files"
|
||||
HOMEPAGE = "https://github.com/Matroska-Org/libebml"
|
||||
LICENSE = "LGPL-2.1-only"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
SRC_URI = "git://github.com/Matroska-Org/libebml.git;branch=v1.x;protocol=https"
|
||||
SRCREV = "8330b222fec992b295c8b2149cf70f9ff648ce4a"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit pkgconfig cmake dos2unix
|
||||
|
||||
#Static library enabled by default. It has been added in case you want to use it dynamically.
|
||||
#EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user