Re: UPDATE: multimedia/mkvtoolnix (multimedia/libmatroska, textproc/libebml)
On 4/16/2019 3:19 PM, Rafael Sadowski wrote: On Mon Apr 15, 2019 at 10:18:20PM -0400, Brad Smith wrote: On 4/15/2019 4:00 PM, Rafael Sadowski wrote: Please find attached update diffs for the following ports: - multimedia/libmatroska - textproc/libebml Simple updates to the latest stable versions. Both projects switched to cmake as build-system. - multimedia/mkvtoolnix As always nothing special but depends on the new libmatroska and libebml versions. Comments? OK? I have had updates for libmatroska and libebml sitting in my tree for awhile now. I'm a little annoyed at the half baked CMake conversion. https://github.com/Matroska-Org/libmatroska/issues/17 Is there anyone that knows CMake well that might be able to take a look at what is there and fix the CMake bits so both shared and static libs are built? I accepted the challenge. ;) New diff attached with an option to build and install shared and static libs. Tested with all combinations. Feel free to push it upstream. OK? Thank you. That is awesome. I will see what the author says. OK.
Re: UPDATE: multimedia/mkvtoolnix (multimedia/libmatroska, textproc/libebml)
On Mon Apr 15, 2019 at 10:18:20PM -0400, Brad Smith wrote:
> On 4/15/2019 4:00 PM, Rafael Sadowski wrote:
>
> > Please find attached update diffs for the following ports:
> >
> > - multimedia/libmatroska
> > - textproc/libebml
> >
> > Simple updates to the latest stable versions. Both projects switched to
> > cmake as build-system.
> >
> > - multimedia/mkvtoolnix
> >
> > As always nothing special but depends on the new libmatroska and libebml
> > versions.
> >
> > Comments? OK?
> I have had updates for libmatroska and libebml sitting in my tree for awhile
> now. I'm
> a little annoyed at the half baked CMake conversion.
>
> https://github.com/Matroska-Org/libmatroska/issues/17
>
> Is there anyone that knows CMake well that might be able to take a look at
> what is
> there and fix the CMake bits so both shared and static libs are built?
>
I accepted the challenge. ;) New diff attached with an option to build
and install shared and static libs.
Tested with all combinations. Feel free to push it upstream.
OK?
Index: Makefile
===
RCS file: /cvs/ports/textproc/libebml/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile24 Oct 2018 14:28:11 - 1.22
+++ Makefile16 Apr 2019 19:10:32 -
@@ -2,13 +2,12 @@
COMMENT= Extensible Binary Meta Language library
-DISTNAME= libebml-1.3.5
+DISTNAME= libebml-1.3.7
CATEGORIES=textproc
MASTER_SITES= https://dl.matroska.org/downloads/libebml/
EXTRACT_SUFX= .tar.xz
-REVISION= 0
-SHARED_LIBS= ebml3.1
+SHARED_LIBS= ebml3.2
HOMEPAGE= http://www.matroska.org/
@@ -17,10 +16,12 @@ MAINTAINER= Brad Smith
Index: distinfo
===
RCS file: /cvs/ports/textproc/libebml/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo4 Sep 2017 08:01:05 - 1.12
+++ distinfo16 Apr 2019 19:10:32 -
@@ -1,2 +1,2 @@
-SHA256 (libebml-1.3.5.tar.xz) = 2BhBP2B0LC8Da6b1gsXgMg0Sv/7BsPwPwXo5i28EqgA=
-SIZE (libebml-1.3.5.tar.xz) = 274184
+SHA256 (libebml-1.3.7.tar.xz) = 4yRMh/WE1/yMNxiBprewZYPMBB+I4uP66aIV2cpY6fQ=
+SIZE (libebml-1.3.7.tar.xz) = 69460
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt16 Apr 2019 19:10:32 -
@@ -0,0 +1,106 @@
+$OpenBSD$
+
+Add options for building and installing shared, static libraries
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -4,6 +4,8 @@ project(ebml VERSION 1.3.7)
+
+ option(DISABLE_PKGCONFIG "Disable PkgConfig module generation" OFF)
+ option(DISABLE_CMAKE_CONFIG "Disable CMake package config module generation"
OFF)
++option(DISABLE_SHARED_LIBS "Disable build and install shared libraries" OFF)
++option(DISABLE_STATIC_LIBS "Disable build and install static libraries" OFF)
+
+ include(GNUInstallDirs)
+
+@@ -63,40 +65,54 @@ set(libebml_PUBLIC_HEADERS
+
+ set(libebml_C_PUBLIC_HEADERS ebml/c/libebml_t.h)
+
+-add_library(ebml ${libebml_SOURCES} ${libebml_PUBLIC_HEADERS}
${libebml_C_PUBLIC_HEADERS})
+-if(WIN32)
+- include(CheckIncludeFile)
+- check_include_file(winapifamily.h HAVE_WINAPIFAMILY_H)
+- if(HAVE_WINAPIFAMILY_H)
+-target_compile_definitions(ebml PUBLIC HAVE_WINAPIFAMILY_H)
+- endif()
++foreach (TYPE IN ITEMS STATIC SHARED)
++ if (NOT DISABLE_${TYPE}_LIBS)
++string (TOLOWER "${TYPE}" type)
++add_library(ebml-${type} ${TYPE} ${libebml_SOURCES}
${libebml_PUBLIC_HEADERS} ${libebml_C_PUBLIC_HEADERS})
++set_target_properties(ebml-${type} PROPERTIES
++ VERSION 4.0.0
++ SOVERSION 4)
++target_include_directories(ebml-${type} PUBLIC
++ $
++ $)
++if(MSVC)
++ target_compile_definitions(ebml-${type} PRIVATE _CRT_SECURE_NO_WARNINGS)
++endif()
++if(WIN32)
++ include(CheckIncludeFile)
++ check_include_file(winapifamily.h HAVE_WINAPIFAMILY_H)
++ if(HAVE_WINAPIFAMILY_H)
++target_compile_definitions(ebml-${type} PUBLIC HAVE_WINAPIFAMILY_H)
++ endif()
+ endif()
+-set_target_properties(ebml PROPERTIES
+- VERSION 4.0.0
+- SOVERSION 4)
+-target_include_directories(ebml PUBLIC
+- $
+- $)
+-if(MSVC)
+- target_compile_definitions(ebml PRIVATE _CRT_SECURE_NO_WARNINGS)
+-endif()
+-if(BUILD_SHARED_LIBS)
+- set_target_properties(ebml
++ endif()
++endforeach()
++
++if(NOT DISABLE_SHARED_LIBS)
++ set_target_properties(ebml-shared
+ PROPERTIES
+ DEFINE_SYMBOL "EBML_DLL_EXPORT"
+ C_VISIBILITY_PRESET hidden
+-VISIBILITY_INLINES_HIDDEN 1)
+- target_compile_definitions(ebml
++VISIBILITY_INLINES_HIDDEN 1
++OUTPUT_NAME ebml)
++ target_compile_definitions(ebml-shared
+ PUBLIC EBML_DLL
+ PRIVATE EBML_DLL_EXPORT)
++ install(TARGETS ebml-shared
++
Re: UPDATE: multimedia/mkvtoolnix (multimedia/libmatroska, textproc/libebml)
See devel/jansson. I'm not convinced it's worth doing unless there's a particular reason (in the case of jansson it was because something chroot'ed was using it). -- Sent from a phone, apologies for poor formatting. On 16 April 2019 03:18:43 Brad Smith wrote: On 4/15/2019 4:00 PM, Rafael Sadowski wrote: Please find attached update diffs for the following ports: - multimedia/libmatroska - textproc/libebml Simple updates to the latest stable versions. Both projects switched to cmake as build-system. - multimedia/mkvtoolnix As always nothing special but depends on the new libmatroska and libebml versions. Comments? OK? I have had updates for libmatroska and libebml sitting in my tree for awhile now. I'm a little annoyed at the half baked CMake conversion. https://github.com/Matroska-Org/libmatroska/issues/17 Is there anyone that knows CMake well that might be able to take a look at what is there and fix the CMake bits so both shared and static libs are built?
Re: UPDATE: multimedia/mkvtoolnix (multimedia/libmatroska, textproc/libebml)
On 4/15/2019 4:00 PM, Rafael Sadowski wrote: Please find attached update diffs for the following ports: - multimedia/libmatroska - textproc/libebml Simple updates to the latest stable versions. Both projects switched to cmake as build-system. - multimedia/mkvtoolnix As always nothing special but depends on the new libmatroska and libebml versions. Comments? OK? I have had updates for libmatroska and libebml sitting in my tree for awhile now. I'm a little annoyed at the half baked CMake conversion. https://github.com/Matroska-Org/libmatroska/issues/17 Is there anyone that knows CMake well that might be able to take a look at what is there and fix the CMake bits so both shared and static libs are built?
UPDATE: multimedia/mkvtoolnix (multimedia/libmatroska, textproc/libebml)
Please find attached update diffs for the following ports:
- multimedia/libmatroska
- textproc/libebml
Simple updates to the latest stable versions. Both projects switched to
cmake as build-system.
- multimedia/mkvtoolnix
As always nothing special but depends on the new libmatroska and libebml
versions.
Comments? OK?
RS
Index: Makefile
===
RCS file: /cvs/ports/multimedia/mkvtoolnix/Makefile,v
retrieving revision 1.88
diff -u -p -u -p -r1.88 Makefile
--- Makefile8 Mar 2019 20:00:50 - 1.88
+++ Makefile15 Apr 2019 19:53:36 -
@@ -2,8 +2,7 @@
COMMENT= create, alter and inspect Matroska files
-DISTNAME= mkvtoolnix-31.0.0
-REVISION= 0
+DISTNAME= mkvtoolnix-33.0.0
CATEGORIES=multimedia x11
@@ -14,9 +13,9 @@ MAINTAINER = Rafael Sadowski https://www.bunkus.org/videotools/mkvtoolnix/sources/
@@ -42,8 +41,8 @@ LIB_DEPENDS= audio/flac \
textproc/cmark \
devel/gettext \
devel/libmagic \
- multimedia/libmatroska>=1.4.5 \
- textproc/libebml>=1.3.4
+ multimedia/libmatroska>=1.5.0 \
+ textproc/libebml>=1.3.7
MAKE_ENV+= V=1
Index: distinfo
===
RCS file: /cvs/ports/multimedia/mkvtoolnix/distinfo,v
retrieving revision 1.46
diff -u -p -u -p -r1.46 distinfo
--- distinfo3 Mar 2019 08:51:19 - 1.46
+++ distinfo15 Apr 2019 19:53:36 -
@@ -1,2 +1,2 @@
-SHA256 (mkvtoolnix-31.0.0.tar.xz) =
+YqMOgDkjOuaVuxcsfibdmO7xazohxP58If9qqJQGzU=
-SIZE (mkvtoolnix-31.0.0.tar.xz) = 7282492
+SHA256 (mkvtoolnix-33.0.0.tar.xz) =
krgrGD0U4dTvHdd50A33A/lzWVxq5gsyyfqpzyHiZ4E=
+SIZE (mkvtoolnix-33.0.0.tar.xz) = 7285816
Index:
patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h
===
RCS file:
/cvs/ports/multimedia/mkvtoolnix/patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1
patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h
--- patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h
18 Aug 2018 06:47:58 - 1.1
+++ patches/patch-src_mkvtoolnix-gui_jobs_program_runner_unix_program_runner_h
15 Apr 2019 19:53:36 -
@@ -18,7 +18,7 @@ Index: src/mkvtoolnix-gui/jobs/program_r
-class LinuxProgramRunner: public ProgramRunner {
+class UnixProgramRunner: public ProgramRunner {
- Q_OBJECT;
+ Q_OBJECT
public:
- explicit LinuxProgramRunner();
Index: Makefile
===
RCS file: /cvs/ports/textproc/libebml/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile24 Oct 2018 14:28:11 - 1.22
+++ Makefile15 Apr 2019 18:58:11 -
@@ -2,13 +2,12 @@
COMMENT= Extensible Binary Meta Language library
-DISTNAME= libebml-1.3.5
+DISTNAME= libebml-1.3.7
CATEGORIES=textproc
MASTER_SITES= https://dl.matroska.org/downloads/libebml/
EXTRACT_SUFX= .tar.xz
-REVISION= 0
-SHARED_LIBS= ebml3.1
+SHARED_LIBS= ebml3.2
HOMEPAGE= http://www.matroska.org/
@@ -17,10 +16,14 @@ MAINTAINER= Brad Smith
Index: distinfo
===
RCS file: /cvs/ports/textproc/libebml/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo4 Sep 2017 08:01:05 - 1.12
+++ distinfo15 Apr 2019 18:58:11 -
@@ -1,2 +1,2 @@
-SHA256 (libebml-1.3.5.tar.xz) = 2BhBP2B0LC8Da6b1gsXgMg0Sv/7BsPwPwXo5i28EqgA=
-SIZE (libebml-1.3.5.tar.xz) = 274184
+SHA256 (libebml-1.3.7.tar.xz) = 4yRMh/WE1/yMNxiBprewZYPMBB+I4uP66aIV2cpY6fQ=
+SIZE (libebml-1.3.7.tar.xz) = 69460
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/libebml/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 27 May 2015 21:16:51 - 1.3
+++ pkg/PLIST 15 Apr 2019 18:58:11 -
@@ -29,7 +29,11 @@ include/ebml/SafeReadIOCallback.h
include/ebml/StdIOCallback.h
include/ebml/c/
include/ebml/c/libebml_t.h
-lib/libebml.a
-lib/libebml.la
+lib/cmake/
+lib/cmake/ebml/
+lib/cmake/ebml/EbmlConfig.cmake
+lib/cmake/ebml/EbmlConfigVersion.cmake
+lib/cmake/ebml/EbmlTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/ebml/EbmlTargets.cmake
@lib lib/libebml.so.${LIBebml_VERSION}
lib/pkgconfig/libebml.pc
Index: Makefile
===
RCS file: /cvs/ports/multimedia/libmatroska/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile24 Oct 2018 14:28:08 - 1.25
+++ Makefile15 Apr 2019 19:00:32 -
@@ -2,13 +2,12 @@
COMMENT= extensible open standard audio/video container library
