pkgsrc-WIP-changes archive

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

cingg-netbsd: enable lv2 plugin support (hacky)



Module Name:	pkgsrc-wip
Committed By:	Andrew Randrianasulu <randrianasulu%gmail.com@localhost>
Pushed By:	randrianasulu
Date:		Fri Jul 5 08:21:11 2024 +0300
Changeset:	ff1dfd065ad34cf1c08008a3be269413def9b8e2

Modified Files:
	cingg-netbsd/Makefile
	cingg-netbsd/PLIST
	cingg-netbsd/distinfo
Added Files:
	cingg-netbsd/patches/patch-ac

Log Message:
cingg-netbsd: enable lv2 plugin support (hacky)

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

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

diffstat:
 cingg-netbsd/Makefile         | 49 ++++++++++++++++++-------------------------
 cingg-netbsd/PLIST            |  2 ++
 cingg-netbsd/distinfo         |  1 +
 cingg-netbsd/patches/patch-ac | 45 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 29 deletions(-)

diffs:
diff --git a/cingg-netbsd/Makefile b/cingg-netbsd/Makefile
index 3565b756ef..3fe1ea8125 100644
--- a/cingg-netbsd/Makefile
+++ b/cingg-netbsd/Makefile
@@ -2,7 +2,7 @@
 DISTNAME=		cinelerra-gg-${DISTVERSION}-${DISTREVISION}
 DISTVERSION=		5.1-20240703
 DISTVERSIONSUFFIX=	-${REV:C/(.......).*/\1/}
-DISTREVISION=		4
+DISTREVISION=		5
 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=/
@@ -38,12 +38,14 @@ GNU_CONFIGURE=	yes
 #CPPFLAGS+=		-I/usr/X11R7/include
 #CPPFLAGS+=		-I/usr/pkg/include/freetype2
 
-CXXFLAGS+=		-I/usr/X11R7/include
-CXXFLAGS+=		-I/usr/pkg/include/freetype2
+#LDFLAGS+=		 -lgtk-x11-2.0 -lgdk-x11-2.0 -lharfbuzz -lpangocairo-1.0 -L/usr/X11R7/lib -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXcomposite -lXdamage -lXfixes -lX11 -Wl,-rpath,/usr/X11R7/lib -lXext -latk-1.0 -lglib-2.0 -lintl -lgobject-2.0 -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lfreetype -Wl,-R/usr/pkg/lib -lfontconfig
 
-CFLAGS+=		-fpermissive
+#CXXFLAGS+=		-I/usr/X11R7/include
+#CXXFLAGS+=		-I/usr/pkg/include/freetype2
 
-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:/usr/pkg/include/OpenEXR:/usr/pkg/include/Imath  LIBRARY_PATH=${PREFIX}/lib:/usr/X11R7/lib:${PREFIX}/lib/ffmpeg6 BSD=1
+CFLAGS+=		-fpermissive -I/usr/pkg/include/suil-0
+
+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:/usr/pkg/include/OpenEXR:/usr/pkg/include/Imath:/usr/pkg/include/suil-0  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
@@ -54,14 +56,14 @@ CONFIGURE_ARGS+=	--without-dv
 CONFIGURE_ARGS+=	--without-dvb
 CONFIGURE_ARGS+=	--with-openexr
 CONFIGURE_ARGS+=	--without-video4linux2
-CONFIGURE_ARGS+=	--without-xxf86vm
+CONFIGURE_ARGS+=	--with-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+=	--with-lv2
 CONFIGURE_ARGS+=	--without-libzmpeg
 CONFIGURE_ARGS+=	--without-commercial
 CONFIGURE_ARGS+=	--without-thirdparty
@@ -72,32 +74,13 @@ CONFIGURE_DIRS=		${WRKSRC}/cinelerra-5.1
 #BUILD_DIRS=		${WRKSRC}/cinelerra-${DISTVERSION:C/-.*//}
 #INSTALL_DIRS=		${BUILD_WRKSRC}
 
-DATADIR=		${PREFIX}/share/cin
-
-OPTIONS_DEFINE=		LV2 OPENGL
-OPTIONS_DEFAULT=	LV2 OPENGL
-OPTIONS_SUB=		yes
-
-LV2_DESC=		Use LV2 plugins
-LV2_CONFIGURE_WITH=	lv2
-LV2_USES=		gnome pkg-config
-LV2_USE=		GNOME=atk,cairo,gdkpixbuf2,glib20,gtk20,pango
-LV2_CFLAGS=		-I${LOCALBASE}/include/lilv-0 -I${LOCALBASE}/include/suil-0
-LV2_BUILD_DEPENDS=	lv2>0:audio/lv2
-LV2_LIB_DEPENDS=	liblilv-0.so:audio/lilv \
-			libserd-0.so:devel/serd \
-			libsord-0.so:devel/sord \
-			libsratom-0.so:audio/sratom \
-			libsuil-0.so:audio/suil
-
-OPENGL_CONFIGURE_WITH=	gl
-OPENGL_USES=		gl
-OPENGL_USE=		GL=gl,glu
-
 post-patch:
 #	# the patch recommended by the upstream
 #	@cd ${CONFIGURE_WRKSRC}/ffmpeg && \
 #		for f in `grep -lr libfdk_ .`; do ${REINPLACE_CMD} -e 's/libfdk_//' -i '' $$f; done;
+# fix pkgsrc bugs?
+	rm ${WRKSRC}/../.tools/bin/pkg-config
+	ln -s ${PREFIX}/bin/pkg-config ${WRKSRC}/../.tools/bin/pkg-config
 #	# fix lipng for lpng16
 	cd ${CONFIGURE_DIRS}/guicast && sed -i -e 's|-lz|-lz -lpng16|' Makefile
 	# remove thirdparty/src for more space
@@ -122,10 +105,17 @@ do-install:
 	cd ${CONFIGURE_DIRS} && ${SETENV} ${MAKE_ENV} gmake ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} install
 
 
+.include "../../mk/tools/pkg-config.mk"
+.include "../../devel/pkgconf/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
+.include "../../devel/libdeflate/buildlink3.mk"
 .include "../../multimedia/libdv/buildlink3.mk"
 .include "../../multimedia/mjpegtools/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/alsa-lib/buildlink3.mk"
+.include "../../audio/lv2/buildlink3.mk"
+.include "../../audio/lilv/buildlink3.mk"
+.include "../../audio/suil/buildlink3.mk"
 .include "../../multimedia/ffmpeg6/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
@@ -150,6 +140,7 @@ do-install:
 .include "../../multimedia/libva/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../multimedia/libva/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 #.include "../../graphics/openexr/buildlink3.mk"
diff --git a/cingg-netbsd/PLIST b/cingg-netbsd/PLIST
index 0056a46427..7770e14379 100644
--- a/cingg-netbsd/PLIST
+++ b/cingg-netbsd/PLIST
@@ -1,6 +1,7 @@
 @comment $NetBSD$
 bin/bdwrite
 bin/cin
+lib/cin/lv2ui
 lib/cin/plugins/audio/audioscope.plugin
 lib/cin/plugins/audio/chorus.plugin
 lib/cin/plugins/audio/compressor.plugin
@@ -1404,6 +1405,7 @@ share/cin/ffmpeg/video/youtube.dfl
 share/cin/ffmpeg/video/yuv.dfl
 share/cin/ffmpeg/video/yuv4.qt
 share/cin/info/plugins.txt
+share/cin/lv2_blacklist.txt
 share/cin/models/amazon01
 share/cin/models/amazon01.xcf.bz2
 share/cin/models/amazon01_body.png
diff --git a/cingg-netbsd/distinfo b/cingg-netbsd/distinfo
index 3e85ff7493..1b037d8ed9 100644
--- a/cingg-netbsd/distinfo
+++ b/cingg-netbsd/distinfo
@@ -4,3 +4,4 @@ BLAKE2s (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 98552c0774608721d4adf1c5e6
 SHA512 (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 410e311544a73061e0042045f20b16d7137d76a306395844fe76b4410dcde92a2f3bf79f373a2dacdcc456bb7d72bd5939c8762b92c4724b3efe5817ee362002
 Size (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 195630107 bytes
 SHA1 (patch-aa) = c15fb44c81ac2d36af8fd4d4aa0ddcc38812675e
+SHA1 (patch-ac) = cab5d5df661cf7aacc08f2255d41cf81f6e3586f
diff --git a/cingg-netbsd/patches/patch-ac b/cingg-netbsd/patches/patch-ac
new file mode 100644
index 0000000000..c99272fff3
--- /dev/null
+++ b/cingg-netbsd/patches/patch-ac
@@ -0,0 +1,45 @@
+$NetBSD$
+
+lv2 and openexr fixes
+
+--- cinelerra-5.1/configure.ac.orig	2024-07-05 04:24:53.716623204 +0000
++++ cinelerra-5.1/configure.ac	2024-07-05 04:28:50.014303893 +0000
+@@ -30,6 +30,12 @@
+ AC_MSG_ERROR([Please install libtool])
+ fi
+ 
++AC_CHECK_PROG(PKGCONFIG,[pkg-config],[pkg-config],[no])
++if test x"$PKGCONFIG" == x"no" ; then
++AC_MSG_ERROR([Please install pkg-config])
++fi
++
++
+ CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
+ CFG_CFLAGS+=" -pthread -Wall"
+ # misguided pedantic warnings
+@@ -838,7 +844,7 @@
+  CFLAGS="-I/usr/include/sratom-0 -I/usr/local/include/sratom-0 `pkg-config --cflags sratom-0 2>/dev/null`"
+  CHECK_HEADERS([sratom], [sratom headers], [sratom/sratom.h])
+  CHECK_LIB([suil], [suil-0], [suil_instance_new])
+- CFLAGS="-I/usr/include/suil-0 -I/usr/local/include/suil-0 `pkg-config --cflags  suil-0 2>/dev/null`"
++ CFLAGS=" -I/usr/pkg/include/suil-0 -I/usr/local/include/suil-0 `pkg-config --cflags  suil-0 2>/dev/null`"
+  CHECK_HEADERS([suil], [suil headers], [suil/suil.h])
+  CFG_CFLAGS+=" $(pkg-config --cflags lilv-0 2>/dev/null) $(pkg-config --cflags suil-0 2>/dev/null)"
+  LIBS="$saved_LIBS"
+@@ -1192,7 +1198,7 @@
+ 
+ exec > global_config
+ 
+-echo "SHELL := /bin/bash"
++echo "SHELL := /bin/bash"
+ echo "export SHELL"
+ echo "WANT_JOBS := $WANT_JOBS"
+ if test "x$WANT_CLANG" = "xyes" ; then
+@@ -1293,6 +1299,7 @@
+ echo "system_libs += -lintl"
+ echo "system_libs += -lossaudio"
+ echo "system_libs += -lOpenEXR-3_2 -lOpenEXRUtil-3_2 -lOpenEXRCore-3_2 -lIex-3_2 -lIlmThread-3_2 -lImath-3_1"
++echo "CFLAGS += -I${PREFIX}/include/suil-0"
+ 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