pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cingg-netbsd: Update Makefile/PLIST using pkglint help



Module Name:	pkgsrc-wip
Committed By:	Andrew Randrianasulu <randrianasulu%gmail.com@localhost>
Pushed By:	randrianasulu
Date:		Thu Jul 4 22:21:10 2024 +0300
Changeset:	c9112b9db67d67610bebbe0437d8d52d0fbf5631

Modified Files:
	cingg-netbsd/Makefile
	cingg-netbsd/PLIST
	cingg-netbsd/TODO

Log Message:
cingg-netbsd: Update Makefile/PLIST  using pkglint help

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c9112b9db67d67610bebbe0437d8d52d0fbf5631

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cingg-netbsd/Makefile | 82 +++++++++++++++++++++++++--------------------------
 cingg-netbsd/PLIST    | 32 ++++++++++----------
 cingg-netbsd/TODO     |  3 +-
 3 files changed, 57 insertions(+), 60 deletions(-)

diffs:
diff --git a/cingg-netbsd/Makefile b/cingg-netbsd/Makefile
index a791a1376d..11b476eef2 100644
--- a/cingg-netbsd/Makefile
+++ b/cingg-netbsd/Makefile
@@ -1,26 +1,24 @@
 # $NetBSD$
-DISTNAME=	cinelerra-gg-${DISTVERSION}-${DISTREVISION}
-DISTVERSION=	5.1-20240703
+DISTNAME=		cinelerra-gg-${DISTVERSION}-${DISTREVISION}
+DISTVERSION=		5.1-20240703
 DISTVERSIONSUFFIX=	-${REV:C/(.......).*/\1/}
-DISTREVISION=	2
-CATEGORIES=	multimedia
-REV=		73eb8f8d040d50f33db883d12adaaf33a2d1520c # git revision
-MASTER_SITES=	https://git.cinelerra-gg.org/git?p=goodguy/cinelerra.git;a=snapshot;h=${REV};sf=tgz;dummy=/
-#MASTER_SITES=	https://www.cinelerra-gg.org/download/pkgs/src/cin_$DISTVERSION-src.tgz
-DISTFILES=	cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz
+DISTREVISION=		2
+CATEGORIES=		multimedia
+REV=			73eb8f8d040d50f33db883d12adaaf33a2d1520c # git revision
+MASTER_SITES=		https://git.cinelerra-gg.org/git?p=goodguy/cinelerra.git;a=snapshot;h=${REV};sf=tgz;dummy=/
+#MASTER_SITES=		https://www.cinelerra-gg.org/download/pkgs/src/cin_$DISTVERSION-src.tgz
+DISTFILES=		cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 COMMENT=	Professional video editing and compositing environment
 HOMEPAGE=	https://www.cinelerra-gg.org/
 
+LICENSE=	gnu-gpl-v2
+
 ONLY_FOR_PLATFORM=	NetBSD-*-amd64 NetBSD-*-i386
 
 USE_LANGUAGES=		c c++
 
-TOOL_DEPENDS=	bash:../../shells/bash \
-		nasm:../../devel/nasm \
-		yasm:../../devel/yasm \
-
 USE_TOOLS+=	bash:run
 
 #EXTRA_PATCHES=	${BUILD_WRKSRC}/blds/bsd.patch:-p1
@@ -40,33 +38,33 @@ GNU_CONFIGURE=	yes
 #CPPFLAGS+=		-I/usr/X11R7/include
 #CPPFLAGS+=		-I/usr/pkg/include/freetype2
 
-CXXFLAGS+=		-I/usr/X11R7/include 
+CXXFLAGS+=		-I/usr/X11R7/include
 CXXFLAGS+=		-I/usr/pkg/include/freetype2
 
 CFLAGS+=		-fpermissive
 #LDFLAGS+=		-lpng16
 
-MAKE_ENV=	C_INCLUDE_PATH=${LOCALBASE}/include:/usr/X11R7/include CPLUS_INCLUDE_PATH=${LOCALBASE}/include:${LOCALBASE}/include/uuid:${LOCALBASE}/include/ffmpeg6:/usr/X11R7/include:/usr/pkg/include/freetype2  LIBRARY_PATH=${LOCALBASE}/lib:/usr/X11R7/lib:${LOCALBASE}/lib/ffmpeg6 BSD=1
-CONFIGURE_ARGS+=	--disable-static-build 
-CONFIGURE_ARGS+=	--disable-lame 
+MAKE_ENV=		C_INCLUDE_PATH=${PREFIX}/include:/usr/X11R7/include CPLUS_INCLUDE_PATH=${PREFIX}/include:${PREFIX}/include/uuid:${PREFIX}/include/ffmpeg6:/usr/X11R7/include:/usr/pkg/include/freetype2  LIBRARY_PATH=${PREFIX}/lib:/usr/X11R7/lib:${PREFIX}/lib/ffmpeg6 BSD=1
+CONFIGURE_ARGS+=	--disable-static-build
+CONFIGURE_ARGS+=	--disable-lame
 CONFIGURE_ARGS+=	--disable-twolame
-CONFIGURE_ARGS+=	--with-oss 
-CONFIGURE_ARGS+=	--without-alsa 
-CONFIGURE_ARGS+=	--without-firewire 
-CONFIGURE_ARGS+=	--without-dv 
-CONFIGURE_ARGS+=	--without-dvb 
+CONFIGURE_ARGS+=	--with-oss
+CONFIGURE_ARGS+=	--without-alsa
+CONFIGURE_ARGS+=	--without-firewire
+CONFIGURE_ARGS+=	--without-dv
+CONFIGURE_ARGS+=	--without-dvb
 CONFIGURE_ARGS+=	--without-openexr
-CONFIGURE_ARGS+=	--without-video4linux2 
-CONFIGURE_ARGS+=	--without-xxf86vm 
+CONFIGURE_ARGS+=	--without-video4linux2
+CONFIGURE_ARGS+=	--without-xxf86vm
 CONFIGURE_ARGS+=	--without-ladspa-build
-CONFIGURE_ARGS+=	--without-shuttle 
-CONFIGURE_ARGS+=	--without-libdpx 
-CONFIGURE_ARGS+=	--without-shuttle-usb 
-CONFIGURE_ARGS+=	--without-x10tv 
-CONFIGURE_ARGS+=	--without-wintv 
-CONFIGURE_ARGS+=	--without-lv2 
-CONFIGURE_ARGS+=	--without-libzmpeg 
-CONFIGURE_ARGS+=	--without-commercial 
+CONFIGURE_ARGS+=	--without-shuttle
+CONFIGURE_ARGS+=	--without-libdpx
+CONFIGURE_ARGS+=	--without-shuttle-usb
+CONFIGURE_ARGS+=	--without-x10tv
+CONFIGURE_ARGS+=	--without-wintv
+CONFIGURE_ARGS+=	--without-lv2
+CONFIGURE_ARGS+=	--without-libzmpeg
+CONFIGURE_ARGS+=	--without-commercial
 CONFIGURE_ARGS+=	--without-thirdparty
 CONFIGURE_ARGS+=	--with-jobs=4
 
@@ -102,27 +100,27 @@ post-patch:
 #	@cd ${CONFIGURE_WRKSRC}/ffmpeg && \
 #		for f in `grep -lr libfdk_ .`; do ${REINPLACE_CMD} -e 's/libfdk_//' -i '' $$f; done;
 #	# fix lipng for lpng16
-	@cd ${CONFIGURE_DIRS}/guicast && sed -i -e 's|-lz|-lz -lpng16|' Makefile
+	cd ${CONFIGURE_DIRS}/guicast && sed -i -e 's|-lz|-lz -lpng16|' Makefile
 	# remove thirdparty/src for more space
-	@rm -rf ${CONFIGURE_DIRS}/thirdparty/src/*
+	rm -rf ${CONFIGURE_DIRS}/thirdparty/src/*
 #	# correct the bash interpreter path
-	@cd ${CONFIGURE_DIRS}/cinelerra && sed -i  -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
+	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}  \
+	cd ${CONFIGURE_DIRS}  \
 	&& ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/bash ./autogen.sh
 
-CONFIG_SHELL=bash
+CONFIG_SHELL=	bash
 
 do-configure: # naeed MAKE_ENV esp BSD=1
-	@cd ${CONFIGURE_DIRS}  && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/bash configure ${CONFIGURE_ARGS}
-	
+	cd ${CONFIGURE_DIRS}  && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/bash configure ${CONFIGURE_ARGS}
+
 do-build:
-	@cd ${CONFIGURE_DIRS} && ${SETENV} ${MAKE_ENV} gmake ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS}
-	
+	cd ${CONFIGURE_DIRS} && ${SETENV} ${MAKE_ENV} gmake ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS}
+
 do-install:
-	@cd ${CONFIGURE_DIRS} && ${SETENV} ${MAKE_ENV} gmake ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} install
+	cd ${CONFIGURE_DIRS} && ${SETENV} ${MAKE_ENV} gmake ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} install
 
 
 .include "../../multimedia/libdv/buildlink3.mk"
@@ -156,4 +154,4 @@ do-install:
 .include "../../multimedia/libva/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 #.include "../../graphics/openexr/buildlink3.mk"
-#.include "../../graphics/freetype2/buildlink3.mk"
\ No newline at end of file
+#.include "../../graphics/freetype2/buildlink3.mk"
diff --git a/cingg-netbsd/PLIST b/cingg-netbsd/PLIST
index 820b252ba6..0056a46427 100644
--- a/cingg-netbsd/PLIST
+++ b/cingg-netbsd/PLIST
@@ -862,6 +862,7 @@ lib/cin/plugins/video/boxblur.plugin
 lib/cin/plugins/video/brightness.plugin
 lib/cin/plugins/video/burn.plugin
 lib/cin/plugins/video/chromakey.plugin
+lib/cin/plugins/video/chromakeyavid.plugin
 lib/cin/plugins/video/chromakeyhsv.plugin
 lib/cin/plugins/video/color3way.plugin
 lib/cin/plugins/video/colorbalance.plugin
@@ -933,6 +934,7 @@ lib/cin/plugins/video/spherecam.plugin
 lib/cin/plugins/video/svg.plugin
 lib/cin/plugins/video/swapchannels.plugin
 lib/cin/plugins/video/swapframes.plugin
+lib/cin/plugins/video/swatch.plugin
 lib/cin/plugins/video/threshold.plugin
 lib/cin/plugins/video/timeavg.plugin
 lib/cin/plugins/video/timeblur.plugin
@@ -1046,21 +1048,6 @@ share/cin/doc/zoompanel.png
 share/cin/expanders.es
 share/cin/expanders.fr
 share/cin/expanders.txt
-lib/cin/plugins/video/chromakeyavid.plugin
-lib/cin/plugins/video/swatch.plugin
-share/cin/ffmpeg/audio/dv.dv
-share/cin/ffmpeg/audio/dvd_pcm.dvd
-share/cin/ffmpeg/audio/mp2.dfl
-share/cin/ffmpeg/audio/mp2.mp2
-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/dv.dv
-share/cin/ffmpeg/video/hdr.dfl
-share/cin/ffmpeg/video/hdr.hdr
-share/cin/ffmpeg/video/wbmp.dfl
-share/cin/ffmpeg/video/wbmp.wbmp
 share/cin/ffmpeg/audio/aac256k.pro
 share/cin/ffmpeg/audio/alac.m4a
 share/cin/ffmpeg/audio/alac.mkv
@@ -1075,8 +1062,10 @@ share/cin/ffmpeg/audio/bluray_truehd.m2ts
 share/cin/ffmpeg/audio/dca.qt
 share/cin/ffmpeg/audio/dnxhr_pcm_s16.mov
 share/cin/ffmpeg/audio/dnxhr_pcm_s24.mov
+share/cin/ffmpeg/audio/dv.dv
 share/cin/ffmpeg/audio/dvd.dfl
 share/cin/ffmpeg/audio/dvd.dvd
+share/cin/ffmpeg/audio/dvd_pcm.dvd
 share/cin/ffmpeg/audio/f4v.dfl
 share/cin/ffmpeg/audio/faststart_h264.mp4
 share/cin/ffmpeg/audio/faststart_h264.qt
@@ -1093,6 +1082,8 @@ share/cin/ffmpeg/audio/m4a.dfl
 share/cin/ffmpeg/audio/mkv.dfl
 share/cin/ffmpeg/audio/mov.dfl
 share/cin/ffmpeg/audio/mov.mov
+share/cin/ffmpeg/audio/mp2.dfl
+share/cin/ffmpeg/audio/mp2.mp2
 share/cin/ffmpeg/audio/mp3.dfl
 share/cin/ffmpeg/audio/mp3.f4v
 share/cin/ffmpeg/audio/mp3.flv
@@ -1170,6 +1161,10 @@ 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_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/avc422.m2ts
 share/cin/ffmpeg/video/avi.dfl
 share/cin/ffmpeg/video/avif.avif
@@ -1199,6 +1194,7 @@ share/cin/ffmpeg/video/dnxhr_hqx.mov
 share/cin/ffmpeg/video/dnxhr_lb.mov
 share/cin/ffmpeg/video/dnxhr_sq.mov
 share/cin/ffmpeg/video/dpx.dfl
+share/cin/ffmpeg/video/dv.dv
 share/cin/ffmpeg/video/dv_ntsc.avi
 share/cin/ffmpeg/video/dv_pal.avi
 share/cin/ffmpeg/video/dv_pal.qt
@@ -1239,6 +1235,8 @@ share/cin/ffmpeg/video/h265.mp4
 share/cin/ffmpeg/video/h265_nvenc.mp4
 share/cin/ffmpeg/video/hd.youtube
 share/cin/ffmpeg/video/hd_h264.youtube
+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_vaapi.mp4
@@ -1391,6 +1389,8 @@ 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/wbmp.dfl
+share/cin/ffmpeg/video/wbmp.wbmp
 share/cin/ffmpeg/video/webm.dfl
 share/cin/ffmpeg/video/webm.webm
 share/cin/ffmpeg/video/webp.dfl
@@ -1490,5 +1490,3 @@ share/locale/vi/LC_MESSAGES/cin.mo
 share/locale/zh/LC_MESSAGES/cin.mo
 share/pixmaps/cin.svg
 share/pixmaps/cin.xpm
-@ lib/cin/plugins/picon/cinfinity
-@ share/cin/lv2
diff --git a/cingg-netbsd/TODO b/cingg-netbsd/TODO
index fdbe015595..f0979084cc 100644
--- a/cingg-netbsd/TODO
+++ b/cingg-netbsd/TODO
@@ -1 +1,2 @@
-Test on other architectures (aarch64, ppc), run pkglint
\ No newline at end of file
+Test on other architectures (aarch64, ppc), fix warns by pkglint
+learn how to use OPTIONS mechanism
\ No newline at end of file


Home | Main Index | Thread Index | Old Index