pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
cingg-netbsd: update to 20241228, respect MAKE_JOBS
Module Name: pkgsrc-wip
Committed By: Andrew Randrianasulu <randrianasulu%gmail.com@localhost>
Pushed By: randrianasulu
Date: Sat Jan 25 16:40:39 2025 +0300
Changeset: a7782da3262fe2c09534caf87f36d967b99c191d
Modified Files:
cingg-netbsd/Makefile
cingg-netbsd/PLIST
cingg-netbsd/distinfo
Removed Files:
cingg-netbsd/patches/patch-aa
Log Message:
cingg-netbsd: update to 20241228, respect MAKE_JOBS
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a7782da3262fe2c09534caf87f36d967b99c191d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
cingg-netbsd/Makefile | 18 ++++++++++--------
cingg-netbsd/PLIST | 35 +++++++++++++++++++++++++++++++----
cingg-netbsd/distinfo | 6 +++---
cingg-netbsd/patches/patch-aa | 13 -------------
4 files changed, 44 insertions(+), 28 deletions(-)
diffs:
diff --git a/cingg-netbsd/Makefile b/cingg-netbsd/Makefile
index 2a9a8ba19e..83e7512153 100644
--- a/cingg-netbsd/Makefile
+++ b/cingg-netbsd/Makefile
@@ -1,12 +1,12 @@
# $NetBSD$
DISTNAME= cinelerra-gg-${DISTVERSION}-${DISTREVISION}
-DISTVERSION= 5.1-20240703
+DISTVERSION= 5.1-20241228
#DISTVERSIONSUFFIX= -${REV:C/(.......).*/\1/}
-DISTREVISION= 5
+DISTREVISION= 1
CATEGORIES= multimedia
-REV= 73eb8f8d040d50f33db883d12adaaf33a2d1520c # git revision
+REV= c92ff91450d5a66e8bef72a103ae13002144953c # git revision
MASTER_SITES= https://git.cinelerra-gg.org/git?p=goodguy/cinelerra.git;a=snapshot;h=${REV};sf=tgz;dummy=/
-DISTFILES= cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz
+DISTFILES= cinelerra-c92ff91.tar.gz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Professional video editing and compositing environment
@@ -16,6 +16,8 @@ LICENSE= gnu-gpl-v2
ONLY_FOR_PLATFORM= NetBSD-*-x86_64 NetBSD-*-i386
+#CHECK_PORTABILITY_SKIP=cinelerra-5.1/configure
+
USE_LANGUAGES= c c++
USE_TOOLS+= bash:run pkg-config
@@ -51,7 +53,7 @@ CONFIGURE_ARGS+= --with-lv2
CONFIGURE_ARGS+= --without-libzmpeg
CONFIGURE_ARGS+= --without-commercial
CONFIGURE_ARGS+= --without-thirdparty
-CONFIGURE_ARGS+= --with-jobs=4
+CONFIGURE_ARGS+= --with-jobs=${MAKE_JOBS:U1}
WRKSRC= ${WRKDIR}/cinelerra-${REV:C/(.......).*/\1/}
CONFIGURE_DIRS= ${WRKSRC}/cinelerra-5.1
@@ -63,8 +65,8 @@ post-patch:
# remove thirdparty/src for more space
rm -rf ${CONFIGURE_DIRS}/thirdparty/src/*
# # correct the bash interpreter path
- cd ${CONFIGURE_DIRS}/cinelerra && sed -i -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
- ../configure.ac bdcreate.C dvdcreate.C shbtnprefs.C
+# cd ${CONFIGURE_DIRS}/cinelerra && sed -i -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
+# ../configure.ac bdcreate.C dvdcreate.C shbtnprefs.C
pre-configure:
cd ${CONFIGURE_DIRS} \
@@ -72,7 +74,7 @@ pre-configure:
CONFIG_SHELL= bash
-do-configure: # naeed MAKE_ENV esp BSD=1
+do-configure: # need MAKE_ENV esp BSD=1
cd ${CONFIGURE_DIRS} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/bash configure ${CONFIGURE_ARGS}
do-build:
diff --git a/cingg-netbsd/PLIST b/cingg-netbsd/PLIST
index 7770e14379..53c97e25e6 100644
--- a/cingg-netbsd/PLIST
+++ b/cingg-netbsd/PLIST
@@ -148,6 +148,7 @@ lib/cin/plugins/picon/cinfinity2/burn.png
lib/cin/plugins/picon/cinfinity2/butterworth_1902.png
lib/cin/plugins/picon/cinfinity2/chebstortion_1430.png
lib/cin/plugins/picon/cinfinity2/chromakey.png
+lib/cin/plugins/picon/cinfinity2/chromakeyavid.png
lib/cin/plugins/picon/cinfinity2/chromakeyhsv.png
lib/cin/plugins/picon/cinfinity2/clip_folder.png
lib/cin/plugins/picon/cinfinity2/clip_icon.png
@@ -506,6 +507,7 @@ lib/cin/plugins/picon/cinfinity2/svf_1214.png
lib/cin/plugins/picon/cinfinity2/svg.png
lib/cin/plugins/picon/cinfinity2/swapchannels.png
lib/cin/plugins/picon/cinfinity2/swapframes.png
+lib/cin/plugins/picon/cinfinity2/swatch.png
lib/cin/plugins/picon/cinfinity2/synthesizer.png
lib/cin/plugins/picon/cinfinity2/tape_delay_1211.png
lib/cin/plugins/picon/cinfinity2/threshold.png
@@ -550,8 +552,6 @@ lib/cin/plugins/picon/original/blur.png
lib/cin/plugins/picon/original/blurzoom.png
lib/cin/plugins/picon/original/brightness.png
lib/cin/plugins/picon/original/burn.png
-lib/cin/plugins/picon/original/chromakey.png
-lib/cin/plugins/picon/original/chromakeyhsv.png
lib/cin/plugins/picon/original/colorbalance.png
lib/cin/plugins/picon/original/compressor.png
lib/cin/plugins/picon/original/crossfade.png
@@ -564,7 +564,6 @@ lib/cin/plugins/picon/original/denoisefft.png
lib/cin/plugins/picon/original/denoisemjpeg.png
lib/cin/plugins/picon/original/denoisevideo.png
lib/cin/plugins/picon/original/despike.png
-lib/cin/plugins/picon/original/diffkey.png
lib/cin/plugins/picon/original/dissolve.png
lib/cin/plugins/picon/original/dot.png
lib/cin/plugins/picon/original/downsample.png
@@ -1161,11 +1160,19 @@ share/cin/ffmpeg/video/apng.apng
share/cin/ffmpeg/video/apng.dfl
share/cin/ffmpeg/video/asv1.avi
share/cin/ffmpeg/video/asv2.avi
-share/cin/ffmpeg/video/av1.webm
+share/cin/ffmpeg/video/av1_aom.webm
+share/cin/ffmpeg/video/av1_qsv_10b420.mp4
+share/cin/ffmpeg/video/av1_qsv_10b420.webm
+share/cin/ffmpeg/video/av1_qsv_8b420.mp4
+share/cin/ffmpeg/video/av1_qsv_8b420.webm
share/cin/ffmpeg/video/av1_svt.mkv
share/cin/ffmpeg/video/av1_svt.webm
share/cin/ffmpeg/video/av1_vaapi.dfl
share/cin/ffmpeg/video/av1_vaapi.webm
+share/cin/ffmpeg/video/av1_vaapi_10b420.mp4
+share/cin/ffmpeg/video/av1_vaapi_10b420.webm
+share/cin/ffmpeg/video/av1_vaapi_8b420.mp4
+share/cin/ffmpeg/video/av1_vaapi_8b420.webm
share/cin/ffmpeg/video/avc422.m2ts
share/cin/ffmpeg/video/avi.dfl
share/cin/ffmpeg/video/avif.avif
@@ -1221,12 +1228,15 @@ share/cin/ffmpeg/video/h264-10bit.mp4
share/cin/ffmpeg/video/h264-rgb.mp4
share/cin/ffmpeg/video/h264.f4v
share/cin/ffmpeg/video/h264.mp4
+share/cin/ffmpeg/video/h264_mediacodec.mp4
share/cin/ffmpeg/video/h264_metadata.mp4
share/cin/ffmpeg/video/h264_nvenc.mp4
share/cin/ffmpeg/video/h264_nvenc.qt
+share/cin/ffmpeg/video/h264_qsv_8b420.mp4
share/cin/ffmpeg/video/h264_vaapi.mkv
share/cin/ffmpeg/video/h264_vaapi.mp4
share/cin/ffmpeg/video/h264_vaapi.qt
+share/cin/ffmpeg/video/h264_vaapi_8b420.mp4
share/cin/ffmpeg/video/h265-10bit.mp4
share/cin/ffmpeg/video/h265-12bit.mp4
share/cin/ffmpeg/video/h265-hi.mp4
@@ -1240,7 +1250,14 @@ share/cin/ffmpeg/video/hdr.dfl
share/cin/ffmpeg/video/hdr.hdr
share/cin/ffmpeg/video/hevc422p10.m2ts
share/cin/ffmpeg/video/hevc422p8.m2ts
+share/cin/ffmpeg/video/hevc_mediacodec.mp4
+share/cin/ffmpeg/video/hevc_qsv_10b420.mp4
+share/cin/ffmpeg/video/hevc_qsv_10b422.mp4
+share/cin/ffmpeg/video/hevc_qsv_8b420.mp4
share/cin/ffmpeg/video/hevc_vaapi.mp4
+share/cin/ffmpeg/video/hevc_vaapi_10b420.mp4
+share/cin/ffmpeg/video/hevc_vaapi_10b422.mp4
+share/cin/ffmpeg/video/hevc_vaapi_8b420.mp4
share/cin/ffmpeg/video/huffyuv_screencapture.mov
share/cin/ffmpeg/video/j2k.qt
share/cin/ffmpeg/video/jp2.dfl
@@ -1262,6 +1279,7 @@ share/cin/ffmpeg/video/mpeg.dfl
share/cin/ffmpeg/video/mpeg.mpeg
share/cin/ffmpeg/video/mpeg1.mpeg
share/cin/ffmpeg/video/mpeg2.mpeg
+share/cin/ffmpeg/video/mpeg2_hdv.mpeg
share/cin/ffmpeg/video/mpeg2_hq.mpeg
share/cin/ffmpeg/video/mpeg2_vaapi.mp4
share/cin/ffmpeg/video/msmpeg4.avi
@@ -1307,6 +1325,7 @@ share/cin/ffmpeg/video/png.png
share/cin/ffmpeg/video/png.qt
share/cin/ffmpeg/video/ppm.dfl
share/cin/ffmpeg/video/ppm.ppm
+share/cin/ffmpeg/video/presets_vaapi.tar
share/cin/ffmpeg/video/pro.dfl
share/cin/ffmpeg/video/prores.pro
share/cin/ffmpeg/video/prores_4444.pro
@@ -1390,6 +1409,14 @@ share/cin/ffmpeg/video/vp9_3840x2160_24or25or30fps.mkv
share/cin/ffmpeg/video/vp9_3840x2160_24or25or30fps.webm
share/cin/ffmpeg/video/vp9_3840x2160_50or60fps.mkv
share/cin/ffmpeg/video/vp9_3840x2160_50or60fps.webm
+share/cin/ffmpeg/video/vp9_qsv_10b420.mp4
+share/cin/ffmpeg/video/vp9_qsv_10b420.webm
+share/cin/ffmpeg/video/vp9_qsv_8b420.mp4
+share/cin/ffmpeg/video/vp9_qsv_8b420.webm
+share/cin/ffmpeg/video/vp9_vaapi_10b420.mp4
+share/cin/ffmpeg/video/vp9_vaapi_10b420.webm
+share/cin/ffmpeg/video/vp9_vaapi_8b420.mp4
+share/cin/ffmpeg/video/vp9_vaapi_8b420.webm
share/cin/ffmpeg/video/wbmp.dfl
share/cin/ffmpeg/video/wbmp.wbmp
share/cin/ffmpeg/video/webm.dfl
diff --git a/cingg-netbsd/distinfo b/cingg-netbsd/distinfo
index b06489f9bf..b4b9df95a4 100644
--- a/cingg-netbsd/distinfo
+++ b/cingg-netbsd/distinfo
@@ -1,6 +1,6 @@
$NetBSD$
-BLAKE2s (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 98552c0774608721d4adf1c5e63c138f27416fe840740ea1fd6da1c452ce40d7
-SHA512 (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 410e311544a73061e0042045f20b16d7137d76a306395844fe76b4410dcde92a2f3bf79f373a2dacdcc456bb7d72bd5939c8762b92c4724b3efe5817ee362002
-Size (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 195630107 bytes
+BLAKE2s (cinelerra-c92ff91.tar.gz) = d792a5d9a2a425a60921d9be53f363d1d0568457b65006797fd1a865bdc93b75
+SHA512 (cinelerra-c92ff91.tar.gz) = 96790b72451a430b555b8b4f56d09cae825d194d62d6743f523655daf7471cd00d2984a5b04c0d6b6278e5704fc6095420c80ea9b966baa98615c59d8a7fdd73
+Size (cinelerra-c92ff91.tar.gz) = 223564252 bytes
SHA1 (patch-aa) = ec634efcd8f7f2efca0cee3e8b94606799e4b148
diff --git a/cingg-netbsd/patches/patch-aa b/cingg-netbsd/patches/patch-aa
deleted file mode 100644
index 74a4eada64..0000000000
--- a/cingg-netbsd/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac.orig b/configure.ac
-index 7d98b25..ad557aa 100644
---- ./cinelerra-5.1/configure.ac.orig
-+++ ./cinelerra-5.1/configure.ac
-@@ -1292,6 +1292,8 @@ echo "system_libs += -L/usr/pkg/lib/"
- echo "system_libs += -lpng16"
- echo "system_libs += -lintl"
- echo "system_libs += -lossaudio"
-+echo "system_libs += -rpath=/usr/pkg/lib/ffmpeg6"
-+echo "system_libs += -rpath=/usr/pkg/lib/"
- echo "CFLAGS += -I/usr/X11R7/include"
- echo "CFLAGS += -I/usr/pkg/include/ffmpeg6"
- echo "CFLAGS += $(pkg-config --cflags xft)"
Home |
Main Index |
Thread Index |
Old Index