Merge pull request #12213 from neheb/gerb78

gerbera: add libmatroska support

libs/libebml/Makefile

@@ -0,0 +1,49 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libebml
+PKG_VERSION:=1.3.10
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/Matroska-Org/libebml/tar.gz/release-$(PKG_VERSION)?
+PKG_HASH:=2562bb9bc3248e956a6ed1148eafe4d7d68759257133083c212d14faa8709d1e
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION)
+
+PKG_MAINTAINER:=
+PKG_LICENSE:=LGPL-2.1-or-later
+PKG_LICENSE_FILES:=LICENSE.LGPL
+
+CMAKE_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/libebml
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=a C++ libary to parse EBML files
+  URL:=https://github.com/Matroska-Org/libebml
+  DEPENDS:=+libstdcpp
+  BUILDONLY:=1
+endef
+
+define Package/libebml/description
+  a C++ libary to parse EBML files
+  Specifications may be rendered at http://matroska-org.github.io/libebml/
+endef
+
+CMAKE_OPTIONS += \
+	-DDISABLE_PKGCONFIG=OFF \
+	-DDISABLE_CMAKE_CONFIG=OFF \
+	-DENABLE_WIN32_IO=OFF
+
+TARGET_CFLAGS += -flto
+TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
+
+$(eval $(call BuildPackage,libebml))

libs/libmatroska/Makefile

@@ -0,0 +1,48 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libmatroska
+PKG_VERSION:=1.5.2
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/Matroska-Org/libmatroska/tar.gz/release-$(PKG_VERSION)?
+PKG_HASH:=8d03020ca3a657fe8d1ff57209b4218b6001df2ecd11ae956b428de941f2811f
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION)
+
+PKG_MAINTAINER:=
+PKG_LICENSE:=LGPL-2.1-or-later
+PKG_LICENSE_FILES:=LICENSE.LGPL
+
+CMAKE_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_BUILD_DEPENDS:=libebml
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/libmatroska
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=a C++ libary to parse Matroska files (.mkv and .mka)
+  URL:=https://github.com/Matroska-Org/libmatroska
+  DEPENDS:=+libstdcpp
+  BUILDONLY:=1
+endef
+
+define Package/libmatroska/description
+  a C++ libary to parse and create Matroska files
+endef
+
+CMAKE_OPTIONS += \
+	-DDISABLE_PKGCONFIG=OFF \
+	-DDISABLE_CMAKE_CONFIG=OFF
+
+TARGET_CFLAGS += -flto
+TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
+
+$(eval $(call BuildPackage,libmatroska))

multimedia/gerbera/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gerbera
 PKG_VERSION:=1.5.0
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/gerbera/gerbera/tar.gz/v$(PKG_VERSION)?
@@ -19,7 +19,7 @@ PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=LICENSE.md
 
-PKG_BUILD_DEPENDS:=pugixml spdlog
+PKG_BUILD_DEPENDS:=libmatroska pugixml spdlog
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -58,7 +58,7 @@ CMAKE_OPTIONS += \
 	-DWITH_FFMPEGTHUMBNAILER=OFF \
 	-DWITH_EXIF=ON \
 	-DWITH_EXIV2=OFF \
-	-DWITH_MATROSKA=OFF \
+	-DWITH_MATROSKA=ON \
 	-DWITH_SYSTEMD=OFF \
 	-DWITH_LASTFM=OFF \
 	-DWITH_DEBUG=OFF \