diff options
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/ffms2/Makefile | 34 | ||||
-rw-r--r-- | multimedia/ffms2/distinfo | 14 | ||||
-rw-r--r-- | multimedia/ffms2/files/patch-use-system-vapoursynth | 34 | ||||
-rw-r--r-- | multimedia/ffms2/pkg-plist | 5 | ||||
-rw-r--r-- | multimedia/kew/Makefile | 1 | ||||
-rw-r--r-- | multimedia/mpv/Makefile | 5 | ||||
-rw-r--r-- | multimedia/mpv/distinfo | 4 | ||||
-rw-r--r-- | multimedia/nymphcast/Makefile | 2 | ||||
-rw-r--r-- | multimedia/obuparse/Makefile | 18 | ||||
-rw-r--r-- | multimedia/obuparse/distinfo | 6 | ||||
-rw-r--r-- | multimedia/obuparse/files/patch-CMakeLists.txt | 78 | ||||
-rw-r--r-- | multimedia/obuparse/files/patch-Makefile | 33 | ||||
-rw-r--r-- | multimedia/pitivi/Makefile | 2 | ||||
-rw-r--r-- | multimedia/py-moviepy/Makefile | 1 | ||||
-rw-r--r-- | multimedia/py-tartube/Makefile | 1 | ||||
-rw-r--r-- | multimedia/ytfzf/Makefile | 1 |
16 files changed, 158 insertions, 81 deletions
diff --git a/multimedia/ffms2/Makefile b/multimedia/ffms2/Makefile index e914a59843da..e0289ee9ae82 100644 --- a/multimedia/ffms2/Makefile +++ b/multimedia/ffms2/Makefile @@ -1,12 +1,9 @@ PORTNAME= ffms2 -DISTVERSION= 2.40 -PORTREVISION= 3 +DISTVERSION= 5.0 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 96cbf38ea938.patch:-p1 # https://github.com/FFMS/ffms2/pull/380 -PATCHFILES+= 586d87de3f89.patch:-p1 # https://github.com/FFMS/ffms2/pull/380 -PATCHFILES+= 45673149e9a2.patch:-p1 # https://github.com/FFMS/ffms2/pull/380 +PATCHFILES= 25cef14386fcaaa58ee547065deee8f6e82c56a2.patch:-p1 MAINTAINER= ports@FreeBSD.org COMMENT= FFmpeg-based source library and VapourSynth plugin @@ -22,27 +19,26 @@ USE_GITHUB= yes GH_ACCOUNT= FFMS USES= autoreconf compiler:c++11-lib gmake libtool pathfix pkgconfig -EXCLUDE= VSHelper.h VSScript.h VapourSynth.h -EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-static -CPPFLAGS+= `pkg-config vapoursynth --cflags` -INSTALL_TARGET= install-strip USE_LDCONFIG= yes + +EXTRACT_AFTER_ARGS= --exclude src/vapoursynth/V*.h \ + --no-same-owner --no-same-permissions + +GNU_CONFIGURE= yes + DATADIR= ${PREFIX}/lib/vapoursynth +INSTALL_TARGET= install-strip -OPTIONS_DEFINE= DOCS +CONFIGURE_ARGS= --enable-static -pre-configure: - @${MKDIR} ${WRKSRC}/src/config # from autogen.sh +OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e '/^dist_doc_DATA/s,=,& \ - doc/${PORTNAME}-vapoursynth.md,' \ - ${WRKSRC}/Makefile.am + doc/${PORTNAME}-vapoursynth.md,' \ + ${WRKSRC}/Makefile.am -post-install: - ${MKDIR} ${STAGEDIR}${DATADIR} - ${LN} -sf ../lib${PORTNAME}.so ${STAGEDIR}${DATADIR}/ +pre-configure: + @${MKDIR} ${WRKSRC}/src/config # from autogen.sh .include <bsd.port.mk> diff --git a/multimedia/ffms2/distinfo b/multimedia/ffms2/distinfo index a8d034f5d271..448224476f05 100644 --- a/multimedia/ffms2/distinfo +++ b/multimedia/ffms2/distinfo @@ -1,9 +1,5 @@ -TIMESTAMP = 1598095686 -SHA256 (FFMS-ffms2-2.40_GH0.tar.gz) = 82e95662946f3d6e1b529eadbd72bed196adfbc41368b2d50493efce6e716320 -SIZE (FFMS-ffms2-2.40_GH0.tar.gz) = 140356 -SHA256 (96cbf38ea938.patch) = dd063e21c6e7887614ab5fb1009cf9b353066829771d4426dfe779d74dfac758 -SIZE (96cbf38ea938.patch) = 13422 -SHA256 (586d87de3f89.patch) = d5ec6ee44bf8f0a2bd943c1c61bace33b7b80559137b71fe5c4af5e7dd9ac7f8 -SIZE (586d87de3f89.patch) = 931 -SHA256 (45673149e9a2.patch) = ecef89ce1bb4158181c96eecdbc2c37e49a880a88e72a271b54ce98832dcf049 -SIZE (45673149e9a2.patch) = 3693 +TIMESTAMP = 1756589822 +SHA256 (FFMS-ffms2-5.0_GH0.tar.gz) = 7770af0bbc0063f9580a6a5c8e7c51f1788f171d7da0b352e48a1e60943a8c3c +SIZE (FFMS-ffms2-5.0_GH0.tar.gz) = 167985 +SHA256 (25cef14386fcaaa58ee547065deee8f6e82c56a2.patch) = f60096f07d8cf63a3abf8aa1066746e174541523bdc642ec2eabde5b1f286926 +SIZE (25cef14386fcaaa58ee547065deee8f6e82c56a2.patch) = 1145 diff --git a/multimedia/ffms2/files/patch-use-system-vapoursynth b/multimedia/ffms2/files/patch-use-system-vapoursynth new file mode 100644 index 000000000000..58c8f06affaf --- /dev/null +++ b/multimedia/ffms2/files/patch-use-system-vapoursynth @@ -0,0 +1,34 @@ +diff -up ffms2-5.0/configure.ac.orig ffms2-5.0/configure.ac +--- configure.ac.orig 2024-05-28 16:52:48.000000000 +0200 ++++ configure.ac 2024-09-20 12:13:11.134979566 +0200 +@@ -118,6 +118,10 @@ if test "$FFMPEG_WORKS" = no; then + AC_MSG_FAILURE([cannot link with FFmpeg]) + fi + ++PKG_CHECK_MODULES(VAPOURSYNTH, [vapoursynth]) ++ ++AC_SUBST([VAPOURSYNTH_CFLAGS]) ++ + src_core_libffms2_la_LDFLAGS="" + AC_MSG_CHECKING([whether -Wl,-Bsymbolic is needed]) + if test "$enable_shared" = yes; then +diff -up ffms2-5.0/Makefile.am.orig ffms2-5.0/Makefile.am +--- Makefile.am.orig 2024-09-20 12:12:14.272194649 +0200 ++++ Makefile.am 2024-09-20 12:13:00.781018729 +0200 +@@ -14,6 +14,7 @@ AM_CPPFLAGS = \ + -DFFMS_EXPORTS \ + -D__STDC_CONSTANT_MACROS \ + @FFMPEG_CFLAGS@ \ ++ @VAPOURSYNTH_CFLAGS@ \ + @ZLIB_CPPFLAGS@ \ + -include config.h + AM_CXXFLAGS = -fvisibility=hidden +@@ -39,8 +40,6 @@ src_core_libffms2_la_SOURCES = \ + src/core/videoutils.h \ + src/core/zipfile.cpp \ + src/core/zipfile.h \ +- src/vapoursynth/VapourSynth4.h \ +- src/vapoursynth/VSHelper4.h \ + src/vapoursynth/vapoursource4.cpp \ + src/vapoursynth/vapoursource4.h \ + src/vapoursynth/vapoursynth4.cpp diff --git a/multimedia/ffms2/pkg-plist b/multimedia/ffms2/pkg-plist index d4164d07ee7d..40a0e0e525ea 100644 --- a/multimedia/ffms2/pkg-plist +++ b/multimedia/ffms2/pkg-plist @@ -3,9 +3,8 @@ include/ffms.h include/ffmscompat.h lib/libffms2.a lib/libffms2.so -lib/libffms2.so.4 -lib/libffms2.so.4.0.0 -%%DATADIR%%/libffms2.so +lib/libffms2.so.5 +lib/libffms2.so.5.0.0 libdata/pkgconfig/ffms2.pc %%PORTDOCS%%%%DOCSDIR%%/ffms2-api.md %%PORTDOCS%%%%DOCSDIR%%/ffms2-changelog.md diff --git a/multimedia/kew/Makefile b/multimedia/kew/Makefile index 53684fd0e945..a19c95840a64 100644 --- a/multimedia/kew/Makefile +++ b/multimedia/kew/Makefile @@ -1,6 +1,7 @@ PORTNAME= kew DISTVERSIONPREFIX= v DISTVERSION= 3.4.1 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index 8e10172157b4..4299cef229c5 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -1,10 +1,13 @@ PORTNAME= mpv DISTVERSIONPREFIX= v DISTVERSION= 0.40.0 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= multimedia audio +PATCH_SITES= https://github.com/mpv-player/mpv/commit/ +PATCHFILES= 26b29fba02a2782f68e2906f837d21201fc6f1b9.patch:-p1 + MAINTAINER= multimedia@FreeBSD.org COMMENT= Free and open-source general-purpose video player WWW= https://mpv.io diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo index 614447cd682c..6b56c0e1e5dc 100644 --- a/multimedia/mpv/distinfo +++ b/multimedia/mpv/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1742924007 +TIMESTAMP = 1756628590 SHA256 (mpv-player-mpv-v0.40.0_GH0.tar.gz) = 10a0f4654f62140a6dd4d380dcf0bbdbdcf6e697556863dc499c296182f081a3 SIZE (mpv-player-mpv-v0.40.0_GH0.tar.gz) = 3561474 +SHA256 (26b29fba02a2782f68e2906f837d21201fc6f1b9.patch) = 9596f2390a120a54d1bc48a3937d6f236feab0c4cecaae8a0d3dec59a38e29b3 +SIZE (26b29fba02a2782f68e2906f837d21201fc6f1b9.patch) = 1569 diff --git a/multimedia/nymphcast/Makefile b/multimedia/nymphcast/Makefile index 92f621330a0e..a92397b3d2e7 100644 --- a/multimedia/nymphcast/Makefile +++ b/multimedia/nymphcast/Makefile @@ -1,6 +1,6 @@ PORTNAME= NymphCast DISTVERSION= v0.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MAINTAINER= adridg@FreeBSD.org diff --git a/multimedia/obuparse/Makefile b/multimedia/obuparse/Makefile index f0d5f5b76336..6e156c658e1a 100644 --- a/multimedia/obuparse/Makefile +++ b/multimedia/obuparse/Makefile @@ -1,5 +1,6 @@ PORTNAME= obuparse -DISTVERSION= g20241212 +DISTVERSIONPREFIX= v +DISTVERSION= 2.0.1 CATEGORIES= multimedia MAINTAINER= diizzy@FreeBSD.org @@ -9,22 +10,19 @@ WWW= https://github.com/dwbuiten/obuparse LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -USES= gmake +USES= cmake USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= dwbuiten -GH_TAGNAME= 918524a - -MAKE_ARGS+= PREFIX="${STAGEDIR}${PREFIX}" - -INSTALL_TARGET= install-shared PLIST_FILES= include/obuparse.h \ lib/libobuparse.so \ - lib/libobuparse.so.1 + lib/libobuparse.so.2 \ + lib/libobuparse.so.${DISTVERSION} -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libobuparse.so.1 +post-patch: + @${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \ + ${PATCH_WRKSRC}/CMakeLists.txt .include <bsd.port.mk> diff --git a/multimedia/obuparse/distinfo b/multimedia/obuparse/distinfo index 2cf89e5bdd7f..a877f417306f 100644 --- a/multimedia/obuparse/distinfo +++ b/multimedia/obuparse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743990877 -SHA256 (dwbuiten-obuparse-g20241212-918524a_GH0.tar.gz) = b23bb4a6eeb77514a5bbc64448666f62cea94bce5346b6ee605b76386a776804 -SIZE (dwbuiten-obuparse-g20241212-918524a_GH0.tar.gz) = 29526 +TIMESTAMP = 1756578144 +SHA256 (dwbuiten-obuparse-v2.0.1_GH0.tar.gz) = 99198db70a34f5448a188983208d52aac8b1ed5d076913d3f621b5abffc3cb71 +SIZE (dwbuiten-obuparse-v2.0.1_GH0.tar.gz) = 29651 diff --git a/multimedia/obuparse/files/patch-CMakeLists.txt b/multimedia/obuparse/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..9b8ca2dc856a --- /dev/null +++ b/multimedia/obuparse/files/patch-CMakeLists.txt @@ -0,0 +1,78 @@ +--- CMakeLists.txt.orig 2025-08-30 18:33:06 UTC ++++ CMakeLists.txt +@@ -0,0 +1,75 @@ ++cmake_minimum_required(VERSION 3.15) ++ ++project(OBUParse VERSION %%DISTVERSION%% LANGUAGES C) ++ ++# --- Set Standard Output Directories --- ++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) ++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) ++set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) ++ ++# --- Build Options --- ++# On MSVC, we only build static to avoid DLL export complexity and naming collisions. ++# On other platforms (including MinGW on Windows), we can build both. ++option(BUILD_SHARED_LIBS "Build the shared library" ON) ++option(BUILD_STATIC_LIBS "Build the static library" OFF) ++ ++if(NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS) ++ message(FATAL_ERROR "You must choose to build at least one library type.") ++endif() ++ ++# --- Library Targets --- ++ ++if(BUILD_SHARED_LIBS) # This block will now be skipped on MSVC ++ add_library(obuparse_shared SHARED obuparse.c) ++ set_target_properties(obuparse_shared PROPERTIES ++ OUTPUT_NAME "obuparse" ++ VERSION ${PROJECT_VERSION} ++ SOVERSION 2 ++ EXPORT_NAME "shared" ++ ) ++ target_include_directories(obuparse_shared PUBLIC ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> ++ $<INSTALL_INTERFACE:include> ++ ) ++ add_library(OBUParse::shared ALIAS obuparse_shared) ++endif() ++ ++if(BUILD_STATIC_LIBS) ++ add_library(obuparse_static STATIC obuparse.c) ++ # The naming collision only happens with MSVC, not MinGW. ++ if(MSVC) ++ set_target_properties(obuparse_static PROPERTIES OUTPUT_NAME "obuparses") ++ else() ++ set_target_properties(obuparse_static PROPERTIES OUTPUT_NAME "obuparse") ++ endif() ++ set_target_properties(obuparse_static PROPERTIES EXPORT_NAME "static") ++ target_include_directories(obuparse_static PUBLIC ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> ++ $<INSTALL_INTERFACE:include> ++ ) ++ add_library(OBUParse::static ALIAS obuparse_static) ++endif() ++ ++# --- Installation --- ++include(GNUInstallDirs) ++ ++# Install the public header file ++install(FILES obuparse.h ++ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ++) ++ ++set(BUILT_TARGETS "") ++if(TARGET obuparse_static) ++ list(APPEND BUILT_TARGETS obuparse_static) ++endif() ++if(TARGET obuparse_shared) ++ list(APPEND BUILT_TARGETS obuparse_shared) ++endif() ++ ++# Install the library targets that were built, and the tool ++install(TARGETS ${BUILT_TARGETS} ++ EXPORT OBUParseTargets ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++) diff --git a/multimedia/obuparse/files/patch-Makefile b/multimedia/obuparse/files/patch-Makefile deleted file mode 100644 index b371f44188b8..000000000000 --- a/multimedia/obuparse/files/patch-Makefile +++ /dev/null @@ -1,33 +0,0 @@ ---- Makefile.orig 2023-07-12 18:02:40 UTC -+++ Makefile -@@ -1,9 +1,9 @@ - PREFIX=/usr/local - --CFLAGS := -O3 -std=c99 -Wall -Wextra -g -fPIC -I. $(CPPFLAGS) -+CFLAGS += -std=c99 -Wall -Wextra -fPIC -I. $(CPPFLAGS) - LDFLAGS += --CC := $(CROSS)gcc --AR := $(CROSS)ar -+CC := $(CC) -+AR := $(AR) - - ifneq (,$(findstring mingw,$(CC))) - LIBSUF=.dll -@@ -11,7 +11,7 @@ ifneq (,$(findstring mingw,$(CC))) - SYSTEM=MINGW - else - LIBSUF=.so -- LDFLAGS=-Wl,--version-script,obuparse.v -+ LDFLAGS+= -Wl,--version-script,obuparse.v - endif - - all: libobuparse$(LIBSUF) libobuparse.a -@@ -24,7 +24,7 @@ libobuparse.a: obuparse.o - $(AR) rcs $@ $^ - - libobuparse$(LIBSUF): obuparse.o -- $(CC) $(LDFLAGS) -shared $^ -o $@ -+ $(CC) $(LDFLAGS) -shared $^ -o $@ -Wl,-soname,libobuparse$(LIBSUF).1 - - install: install-shared install-static - diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile index e3d0425730dd..20e000ba9056 100644 --- a/multimedia/pitivi/Makefile +++ b/multimedia/pitivi/Makefile @@ -1,6 +1,6 @@ PORTNAME= pitivi DISTVERSION= 2023.03 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= GNOME diff --git a/multimedia/py-moviepy/Makefile b/multimedia/py-moviepy/Makefile index 788382e359c8..6440ffaa63b8 100644 --- a/multimedia/py-moviepy/Makefile +++ b/multimedia/py-moviepy/Makefile @@ -1,5 +1,6 @@ PORTNAME= moviepy PORTVERSION= 2.2.1 +PORTREVISION= 1 CATEGORIES= multimedia python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/py-tartube/Makefile b/multimedia/py-tartube/Makefile index 58f33925ea0f..0fe4f7d270d2 100644 --- a/multimedia/py-tartube/Makefile +++ b/multimedia/py-tartube/Makefile @@ -1,5 +1,6 @@ PORTNAME= tartube DISTVERSION= 2.5.164 +PORTREVISION= 1 CATEGORIES= multimedia python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/ytfzf/Makefile b/multimedia/ytfzf/Makefile index 02f2097bed31..f1a4cf1713c7 100644 --- a/multimedia/ytfzf/Makefile +++ b/multimedia/ytfzf/Makefile @@ -1,6 +1,7 @@ PORTNAME= ytfzf DISTVERSIONPREFIX= v DISTVERSION= 2.6.2 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= eduardo@FreeBSD.org |