Received: by mail.netbsd.org (Postfix, from userid 605) id 69E4284DA5; Sat, 23 Apr 2022 19:04:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A1CEC84D69 for ; Sat, 23 Apr 2022 19:04:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id k02jcO0arKNC for ; Sat, 23 Apr 2022 19:04:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id CA24F84CE2 for ; Sat, 23 Apr 2022 19:04:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BA176FB1A; Sat, 23 Apr 2022 19:04:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1650740645265280" MIME-Version: 1.0 Date: Sat, 23 Apr 2022 19:04:05 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2022Q1] pkgsrc/multimedia/pitivi To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20220423190405.BA176FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1650740645265280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Sat Apr 23 19:04:05 UTC 2022 Modified Files: pkgsrc/multimedia/pitivi [pkgsrc-2022Q1]: Makefile PLIST distinfo pkgsrc/multimedia/pitivi/patches [pkgsrc-2022Q1]: patch-meson.build Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.66.2.1 pkgsrc/multimedia/pitivi/Makefile cvs rdiff -u -r1.7 -r1.7.2.1 pkgsrc/multimedia/pitivi/PLIST cvs rdiff -u -r1.8 -r1.8.4.1 pkgsrc/multimedia/pitivi/distinfo cvs rdiff -u -r1.1 -r1.1.20.1 \ pkgsrc/multimedia/pitivi/patches/patch-meson.build Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1650740645265280 Content-Disposition: inline Content-Length: 5141 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/pitivi/Makefile diff -u pkgsrc/multimedia/pitivi/Makefile:1.66 pkgsrc/multimedia/pitivi/Makefile:1.66.2.1 --- pkgsrc/multimedia/pitivi/Makefile:1.66 Mon Jan 3 07:26:01 2022 +++ pkgsrc/multimedia/pitivi/Makefile Sat Apr 23 19:04:05 2022 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.66 2022/01/03 07:26:01 wiz Exp $ +# $NetBSD: Makefile,v 1.66.2.1 2022/04/23 19:04:05 bsiegert Exp $ DISTNAME= pitivi-0.999 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pitivi/0.999/} EXTRACT_SUFX= .tar.xz @@ -49,7 +49,5 @@ LDFLAGS+= -lpython${PYVERSSUFFIX} .include "../../multimedia/gst-plugins1-editing-services/buildlink3.mk" .include "../../multimedia/gst-plugins1-good/buildlink3.mk" .include "../../multimedia/gst-plugins1-gtk/buildlink3.mk" -# HACK: avoid conflict with gst-plugins1-bad... -#.include "../../multimedia/gst-plugins1-transcoder/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/multimedia/pitivi/PLIST diff -u pkgsrc/multimedia/pitivi/PLIST:1.7 pkgsrc/multimedia/pitivi/PLIST:1.7.2.1 --- pkgsrc/multimedia/pitivi/PLIST:1.7 Mon Jan 3 03:30:44 2022 +++ pkgsrc/multimedia/pitivi/PLIST Sat Apr 23 19:04:05 2022 @@ -1,11 +1,5 @@ -@comment $NetBSD: PLIST,v 1.7 2022/01/03 03:30:44 mef Exp $ -bin/gst-transcoder-1.0 +@comment $NetBSD: PLIST,v 1.7.2.1 2022/04/23 19:04:05 bsiegert Exp $ bin/pitivi -include/gstreamer-1.0/gst/transcoder/gsttranscoder.h -lib/girepository-1.0/GstTranscoder-1.0.typelib -lib/gstreamer-1.0/libgsttranscode.so -lib/libgsttranscoder-1.0.so -lib/libgsttranscoder-1.0.so.0 lib/pitivi/python/pitivi/__init__.py lib/pitivi/python/pitivi/__init__.pyc lib/pitivi/python/pitivi/application.py @@ -114,20 +108,8 @@ lib/pitivi/python/pitivi/viewer/title_ov lib/pitivi/python/pitivi/viewer/title_overlay.pyc lib/pitivi/python/pitivi/viewer/viewer.py lib/pitivi/python/pitivi/viewer/viewer.pyc -lib/pkgconfig/gst-transcoder-1.0.pc share/appdata/org.pitivi.Pitivi.appdata.xml share/applications/org.pitivi.Pitivi.desktop -share/gir-1.0/GstTranscoder-1.0.gir -share/gstreamer-1.0/encoding-profiles/device/dvd.gep -share/gstreamer-1.0/encoding-profiles/file-extension/avi.gep -share/gstreamer-1.0/encoding-profiles/file-extension/flv.gep -share/gstreamer-1.0/encoding-profiles/file-extension/mkv.gep -share/gstreamer-1.0/encoding-profiles/file-extension/mp3.gep -share/gstreamer-1.0/encoding-profiles/file-extension/mp4.gep -share/gstreamer-1.0/encoding-profiles/file-extension/oga.gep -share/gstreamer-1.0/encoding-profiles/file-extension/ogv.gep -share/gstreamer-1.0/encoding-profiles/file-extension/webm.gep -share/gstreamer-1.0/encoding-profiles/online-services/youtube.gep share/help/C/pitivi/about.page share/help/C/pitivi/cheatsheet.page share/help/C/pitivi/codecscontainers.page Index: pkgsrc/multimedia/pitivi/distinfo diff -u pkgsrc/multimedia/pitivi/distinfo:1.8 pkgsrc/multimedia/pitivi/distinfo:1.8.4.1 --- pkgsrc/multimedia/pitivi/distinfo:1.8 Tue Oct 26 11:01:15 2021 +++ pkgsrc/multimedia/pitivi/distinfo Sat Apr 23 19:04:05 2022 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2021/10/26 11:01:15 nia Exp $ +$NetBSD: distinfo,v 1.8.4.1 2022/04/23 19:04:05 bsiegert Exp $ BLAKE2s (pitivi-0.999.tar.xz) = d94e1fd226ed99f979c02a99d653f4214dd3de3064d028f7210333012f8766f4 SHA512 (pitivi-0.999.tar.xz) = 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8 Size (pitivi-0.999.tar.xz) = 12296928 bytes -SHA1 (patch-meson.build) = 2438425071aebe6ab78eb9c3b6ccfe17fcc22829 +SHA1 (patch-meson.build) = ce789869f6076be3f81de838d013467eb6da2bb3 Index: pkgsrc/multimedia/pitivi/patches/patch-meson.build diff -u pkgsrc/multimedia/pitivi/patches/patch-meson.build:1.1 pkgsrc/multimedia/pitivi/patches/patch-meson.build:1.1.20.1 --- pkgsrc/multimedia/pitivi/patches/patch-meson.build:1.1 Thu Oct 3 14:59:48 2019 +++ pkgsrc/multimedia/pitivi/patches/patch-meson.build Sat Apr 23 19:04:05 2022 @@ -1,6 +1,9 @@ -$NetBSD: patch-meson.build,v 1.1 2019/10/03 14:59:48 nia Exp $ +$NetBSD: patch-meson.build,v 1.1.20.1 2022/04/23 19:04:05 bsiegert Exp $ -Allow use of pkgsrc's weird names for python. +- pkgsrc does not provide a "python3" link by default, use a + different executable name +- gst-transcoder-1.0 is now part of gst-plugins1-bad and was + renamed. Update pkg-config checks for this. --- meson.build.orig 2018-08-29 14:05:21.000000000 +0000 +++ meson.build @@ -18,3 +21,12 @@ Allow use of pkgsrc's weird names for py if get_option('build-gst') subproject('gst-build', default_options: ['enable_python=true', +@@ -23,7 +23,7 @@ gst_dep = dependency('gstreamer-1.0', ve + cairo_dep = dependency('cairo') + pycairo_dep = dependency('py3cairo') + +-gst_transcoder_dep = dependency('gst-transcoder-1.0', version : '>= 1.8.1', ++gst_transcoder_dep = dependency('gstreamer-transcoder-1.0', version : '>= 1.8.1', + fallback : ['gst-transcoder', 'gst_transcoder_dep']) + + pkgdatadir = join_paths(get_option('datadir'), meson.project_name()) --_----------=_1650740645265280--