Sat Apr 23 19:04:05 2022 UTC ()
Pullup ticket #6620 - requested by nia
multimedia/pitivi: build fix

Revisions pulled up:
- multimedia/pitivi/Makefile                                    1.67
- multimedia/pitivi/PLIST                                       1.8
- multimedia/pitivi/distinfo                                    1.9
- multimedia/pitivi/patches/patch-meson.build                   1.2

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Sun Apr 17 07:18:06 UTC 2022

   Modified Files:
   	pkgsrc/multimedia/pitivi: Makefile PLIST distinfo
   	pkgsrc/multimedia/pitivi/patches: patch-meson.build

   Log Message:
   pitivi: Adapt to new gst-plugins world. Fixes build.


(bsiegert)
diff -r1.66 -r1.66.2.1 pkgsrc/multimedia/pitivi/Makefile
diff -r1.7 -r1.7.2.1 pkgsrc/multimedia/pitivi/PLIST
diff -r1.8 -r1.8.4.1 pkgsrc/multimedia/pitivi/distinfo
diff -r1.1 -r1.1.20.1 pkgsrc/multimedia/pitivi/patches/patch-meson.build
cvs diff -r1.66 -r1.66.2.1 pkgsrc/multimedia/pitivi/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/pitivi/Makefile 2022/01/03 07:26:01 1.66
+++ pkgsrc/multimedia/pitivi/Makefile 2022/04/23 19:04:05 1.66.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.66 2022/01/03 07:26:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.66.2.1 2022/04/23 19:04:05 bsiegert Exp $
2 2
3DISTNAME= pitivi-0.999 3DISTNAME= pitivi-0.999
4PKGREVISION= 7 4PKGREVISION= 8
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pitivi/0.999/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pitivi/0.999/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.pitivi.org/ 10HOMEPAGE= http://www.pitivi.org/
11COMMENT= Video editor using GStreamer/GTK 11COMMENT= Video editor using GStreamer/GTK
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14USE_TOOLS+= pkg-config intltool msgfmt xgettext itstool 14USE_TOOLS+= pkg-config intltool msgfmt xgettext itstool
15 15
16DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 16DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
17DEPENDS+= ${PYPKGPREFIX}-gstreamer1-[0-9]*:../../multimedia/py-gstreamer1 17DEPENDS+= ${PYPKGPREFIX}-gstreamer1-[0-9]*:../../multimedia/py-gstreamer1
@@ -39,17 +39,15 @@ LDFLAGS+= -lpython${PYVERSSUFFIX} @@ -39,17 +39,15 @@ LDFLAGS+= -lpython${PYVERSSUFFIX}
39 39
40.include "../../devel/meson/build.mk" 40.include "../../devel/meson/build.mk"
41.include "../../devel/gobject-introspection/buildlink3.mk" 41.include "../../devel/gobject-introspection/buildlink3.mk"
42.include "../../graphics/gst-plugins1-gdk_pixbuf/buildlink3.mk" 42.include "../../graphics/gst-plugins1-gdk_pixbuf/buildlink3.mk"
43.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 43.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
44.include "../../graphics/py-cairo/buildlink3.mk" 44.include "../../graphics/py-cairo/buildlink3.mk"
45.include "../../lang/python/extension.mk" 45.include "../../lang/python/extension.mk"
46.include "../../lang/python/application.mk" 46.include "../../lang/python/application.mk"
47.include "../../multimedia/frei0r/buildlink3.mk" 47.include "../../multimedia/frei0r/buildlink3.mk"
48.include "../../multimedia/gst-plugins1-bad/buildlink3.mk" 48.include "../../multimedia/gst-plugins1-bad/buildlink3.mk"
49.include "../../multimedia/gst-plugins1-editing-services/buildlink3.mk" 49.include "../../multimedia/gst-plugins1-editing-services/buildlink3.mk"
50.include "../../multimedia/gst-plugins1-good/buildlink3.mk" 50.include "../../multimedia/gst-plugins1-good/buildlink3.mk"
51.include "../../multimedia/gst-plugins1-gtk/buildlink3.mk" 51.include "../../multimedia/gst-plugins1-gtk/buildlink3.mk"
52# HACK: avoid conflict with gst-plugins1-bad... 
53#.include "../../multimedia/gst-plugins1-transcoder/buildlink3.mk" 
54.include "../../sysutils/desktop-file-utils/desktopdb.mk" 52.include "../../sysutils/desktop-file-utils/desktopdb.mk"
55.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.7.2.1 pkgsrc/multimedia/pitivi/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/pitivi/PLIST 2022/01/03 03:30:44 1.7
+++ pkgsrc/multimedia/pitivi/PLIST 2022/04/23 19:04:05 1.7.2.1
@@ -1,21 +1,15 @@ @@ -1,21 +1,15 @@
1@comment $NetBSD: PLIST,v 1.7 2022/01/03 03:30:44 mef Exp $ 1@comment $NetBSD: PLIST,v 1.7.2.1 2022/04/23 19:04:05 bsiegert Exp $
2bin/gst-transcoder-1.0 
3bin/pitivi 2bin/pitivi
4include/gstreamer-1.0/gst/transcoder/gsttranscoder.h 
5lib/girepository-1.0/GstTranscoder-1.0.typelib 
6lib/gstreamer-1.0/libgsttranscode.so 
7lib/libgsttranscoder-1.0.so 
8lib/libgsttranscoder-1.0.so.0 
9lib/pitivi/python/pitivi/__init__.py 3lib/pitivi/python/pitivi/__init__.py
10lib/pitivi/python/pitivi/__init__.pyc 4lib/pitivi/python/pitivi/__init__.pyc
11lib/pitivi/python/pitivi/application.py 5lib/pitivi/python/pitivi/application.py
12lib/pitivi/python/pitivi/application.pyc 6lib/pitivi/python/pitivi/application.pyc
13lib/pitivi/python/pitivi/autoaligner.py 7lib/pitivi/python/pitivi/autoaligner.py
14lib/pitivi/python/pitivi/autoaligner.pyc 8lib/pitivi/python/pitivi/autoaligner.pyc
15lib/pitivi/python/pitivi/check.py 9lib/pitivi/python/pitivi/check.py
16lib/pitivi/python/pitivi/check.pyc 10lib/pitivi/python/pitivi/check.pyc
17lib/pitivi/python/pitivi/clipproperties.py 11lib/pitivi/python/pitivi/clipproperties.py
18lib/pitivi/python/pitivi/clipproperties.pyc 12lib/pitivi/python/pitivi/clipproperties.pyc
19lib/pitivi/python/pitivi/configure.py 13lib/pitivi/python/pitivi/configure.py
20lib/pitivi/python/pitivi/configure.py.in 14lib/pitivi/python/pitivi/configure.py.in
21lib/pitivi/python/pitivi/coptimizations/renderer.c 15lib/pitivi/python/pitivi/coptimizations/renderer.c
@@ -104,40 +98,28 @@ lib/pitivi/python/pitivi/utils/widgets.p @@ -104,40 +98,28 @@ lib/pitivi/python/pitivi/utils/widgets.p
104lib/pitivi/python/pitivi/utils/widgets.pyc 98lib/pitivi/python/pitivi/utils/widgets.pyc
105lib/pitivi/python/pitivi/viewer/__init__.py 99lib/pitivi/python/pitivi/viewer/__init__.py
106lib/pitivi/python/pitivi/viewer/__init__.pyc 100lib/pitivi/python/pitivi/viewer/__init__.pyc
107lib/pitivi/python/pitivi/viewer/move_scale_overlay.py 101lib/pitivi/python/pitivi/viewer/move_scale_overlay.py
108lib/pitivi/python/pitivi/viewer/move_scale_overlay.pyc 102lib/pitivi/python/pitivi/viewer/move_scale_overlay.pyc
109lib/pitivi/python/pitivi/viewer/overlay.py 103lib/pitivi/python/pitivi/viewer/overlay.py
110lib/pitivi/python/pitivi/viewer/overlay.pyc 104lib/pitivi/python/pitivi/viewer/overlay.pyc
111lib/pitivi/python/pitivi/viewer/overlay_stack.py 105lib/pitivi/python/pitivi/viewer/overlay_stack.py
112lib/pitivi/python/pitivi/viewer/overlay_stack.pyc 106lib/pitivi/python/pitivi/viewer/overlay_stack.pyc
113lib/pitivi/python/pitivi/viewer/title_overlay.py 107lib/pitivi/python/pitivi/viewer/title_overlay.py
114lib/pitivi/python/pitivi/viewer/title_overlay.pyc 108lib/pitivi/python/pitivi/viewer/title_overlay.pyc
115lib/pitivi/python/pitivi/viewer/viewer.py 109lib/pitivi/python/pitivi/viewer/viewer.py
116lib/pitivi/python/pitivi/viewer/viewer.pyc 110lib/pitivi/python/pitivi/viewer/viewer.pyc
117lib/pkgconfig/gst-transcoder-1.0.pc 
118share/appdata/org.pitivi.Pitivi.appdata.xml 111share/appdata/org.pitivi.Pitivi.appdata.xml
119share/applications/org.pitivi.Pitivi.desktop 112share/applications/org.pitivi.Pitivi.desktop
120share/gir-1.0/GstTranscoder-1.0.gir 
121share/gstreamer-1.0/encoding-profiles/device/dvd.gep 
122share/gstreamer-1.0/encoding-profiles/file-extension/avi.gep 
123share/gstreamer-1.0/encoding-profiles/file-extension/flv.gep 
124share/gstreamer-1.0/encoding-profiles/file-extension/mkv.gep 
125share/gstreamer-1.0/encoding-profiles/file-extension/mp3.gep 
126share/gstreamer-1.0/encoding-profiles/file-extension/mp4.gep 
127share/gstreamer-1.0/encoding-profiles/file-extension/oga.gep 
128share/gstreamer-1.0/encoding-profiles/file-extension/ogv.gep 
129share/gstreamer-1.0/encoding-profiles/file-extension/webm.gep 
130share/gstreamer-1.0/encoding-profiles/online-services/youtube.gep 
131share/help/C/pitivi/about.page 113share/help/C/pitivi/about.page
132share/help/C/pitivi/cheatsheet.page 114share/help/C/pitivi/cheatsheet.page
133share/help/C/pitivi/codecscontainers.page 115share/help/C/pitivi/codecscontainers.page
134share/help/C/pitivi/effects.page 116share/help/C/pitivi/effects.page
135share/help/C/pitivi/figures/codecscontainers.jpg 117share/help/C/pitivi/figures/codecscontainers.jpg
136share/help/C/pitivi/figures/fadestep1.png 118share/help/C/pitivi/figures/fadestep1.png
137share/help/C/pitivi/figures/fadestep2.png 119share/help/C/pitivi/figures/fadestep2.png
138share/help/C/pitivi/figures/fadestep3.png 120share/help/C/pitivi/figures/fadestep3.png
139share/help/C/pitivi/figures/keyframecurves.png 121share/help/C/pitivi/figures/keyframecurves.png
140share/help/C/pitivi/figures/layers.png 122share/help/C/pitivi/figures/layers.png
141share/help/C/pitivi/figures/logo.png 123share/help/C/pitivi/figures/logo.png
142share/help/C/pitivi/figures/mainwindow.jpg 124share/help/C/pitivi/figures/mainwindow.jpg
143share/help/C/pitivi/figures/ripple-after.png 125share/help/C/pitivi/figures/ripple-after.png
cvs diff -r1.8 -r1.8.4.1 pkgsrc/multimedia/pitivi/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/pitivi/distinfo 2021/10/26 11:01:15 1.8
+++ pkgsrc/multimedia/pitivi/distinfo 2022/04/23 19:04:05 1.8.4.1
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.8 2021/10/26 11:01:15 nia Exp $ 1$NetBSD: distinfo,v 1.8.4.1 2022/04/23 19:04:05 bsiegert Exp $
2 2
3BLAKE2s (pitivi-0.999.tar.xz) = d94e1fd226ed99f979c02a99d653f4214dd3de3064d028f7210333012f8766f4 3BLAKE2s (pitivi-0.999.tar.xz) = d94e1fd226ed99f979c02a99d653f4214dd3de3064d028f7210333012f8766f4
4SHA512 (pitivi-0.999.tar.xz) = 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8 4SHA512 (pitivi-0.999.tar.xz) = 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8
5Size (pitivi-0.999.tar.xz) = 12296928 bytes 5Size (pitivi-0.999.tar.xz) = 12296928 bytes
6SHA1 (patch-meson.build) = 2438425071aebe6ab78eb9c3b6ccfe17fcc22829 6SHA1 (patch-meson.build) = ce789869f6076be3f81de838d013467eb6da2bb3
cvs diff -r1.1 -r1.1.20.1 pkgsrc/multimedia/pitivi/patches/patch-meson.build (expand / switch to unified diff)

--- pkgsrc/multimedia/pitivi/patches/patch-meson.build 2019/10/03 14:59:48 1.1
+++ pkgsrc/multimedia/pitivi/patches/patch-meson.build 2022/04/23 19:04:05 1.1.20.1
@@ -1,20 +1,32 @@ @@ -1,20 +1,32 @@
1$NetBSD: patch-meson.build,v 1.1 2019/10/03 14:59:48 nia Exp $ 1$NetBSD: patch-meson.build,v 1.1.20.1 2022/04/23 19:04:05 bsiegert Exp $
2 2
3Allow use of pkgsrc's weird names for python. 3- pkgsrc does not provide a "python3" link by default, use a
 4 different executable name
 5- gst-transcoder-1.0 is now part of gst-plugins1-bad and was
 6 renamed. Update pkg-config checks for this.
4 7
5--- meson.build.orig 2018-08-29 14:05:21.000000000 +0000 8--- meson.build.orig 2018-08-29 14:05:21.000000000 +0000
6+++ meson.build 9+++ meson.build
7@@ -1,11 +1,11 @@ 10@@ -1,11 +1,11 @@
8 project('pitivi', 'c', version : '0.999', meson_version : '>= 0.41.0') 11 project('pitivi', 'c', version : '0.999', meson_version : '>= 0.41.0')
9  12
10-python = find_program('python3') 13-python = find_program('python3')
11+python = find_program('python@PYVERSSUFFIX@') 14+python = find_program('python@PYVERSSUFFIX@')
12 intltool_merge = find_program('intltool-merge') 15 intltool_merge = find_program('intltool-merge')
13 itstool = find_program('itstool') 16 itstool = find_program('itstool')
14 msgfmt = find_program('msgfmt') 17 msgfmt = find_program('msgfmt')
15  18
16-python_dep = dependency('python3', version : '>= 3.3') 19-python_dep = dependency('python3', version : '>= 3.3')
17+python_dep = dependency('python-@PYVERSSUFFIX@', version : '>= 3.3') 20+python_dep = dependency('python-@PYVERSSUFFIX@', version : '>= 3.3')
18  21
19 if get_option('build-gst') 22 if get_option('build-gst')
20 subproject('gst-build', default_options: ['enable_python=true', 23 subproject('gst-build', default_options: ['enable_python=true',
 24@@ -23,7 +23,7 @@ gst_dep = dependency('gstreamer-1.0', ve
 25 cairo_dep = dependency('cairo')
 26 pycairo_dep = dependency('py3cairo')
 27
 28-gst_transcoder_dep = dependency('gst-transcoder-1.0', version : '>= 1.8.1',
 29+gst_transcoder_dep = dependency('gstreamer-transcoder-1.0', version : '>= 1.8.1',
 30 fallback : ['gst-transcoder', 'gst_transcoder_dep'])
 31
 32 pkgdatadir = join_paths(get_option('datadir'), meson.project_name())