CVS commit: pkgsrc/multimedia/ffmpeg2theora

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jul 24 15:18:38 UTC 2023

Modified Files:
        pkgsrc/multimedia/ffmpeg2theora: Makefile distinfo
        pkgsrc/multimedia/ffmpeg2theora/patches: patch-SConstruct

Log Message:
ffmpeg2theora: switch to scons4

Bump PKGREVISION just to be on the safe side.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/multimedia/ffmpeg2theora/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/multimedia/ffmpeg2theora/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/multimedia/ffmpeg2theora/patches/patch-SConstruct

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

Modified files:

Index: pkgsrc/multimedia/ffmpeg2theora/Makefile
diff -u pkgsrc/multimedia/ffmpeg2theora/Makefile:1.26 pkgsrc/multimedia/ffmpeg2theora/Makefile:1.27
--- pkgsrc/multimedia/ffmpeg2theora/Makefile:1.26       Sun Jan 29 21:17:16 2023
+++ pkgsrc/multimedia/ffmpeg2theora/Makefile    Mon Jul 24 15:18:38 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2023/01/29 21:17:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2023/07/24 15:18:38 wiz Exp $
 
 DISTNAME=      ffmpeg2theora-0.30
-PKGREVISION=   11
+PKGREVISION=   12
 CATEGORIES=    multimedia
 MASTER_SITES=  http://v2v.cc/~j/ffmpeg2theora/downloads/
 EXTRACT_SUFX=  .tar.bz2
@@ -13,26 +13,18 @@ LICENSE=    gnu-gpl-v3
 
 USE_TOOLS+=            pkg-config
 
-INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
+REPLACE_SH+=   version.sh
 
-LDFLAGS=       -lm
+SCONS_BUILD_ARGS+=     APPEND_CCFLAGS=${CFLAGS:Q}
+SCONS_BUILD_ARGS+=     APPEND_LINKFLAGS=${LDFLAGS:Q}
+SCONS_INSTALL_ARGS+=   destdir=${DESTDIR:Q} prefix=${PREFIX:Q}
 
-SCONS_ARGS=    -C ${WRKSRC} destdir=${DESTDIR:Q} prefix=${PREFIX:Q}
-SCONS_ARGS+=   APPEND_CCFLAGS=${CFLAGS:Q}
-SCONS_ARGS+=   APPEND_LINKFLAGS=${LDFLAGS:Q}
-
-do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} ${SCONS_ARGS}
-
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/ffmpeg2theora ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/ffmpeg2theora.1 \
-         ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+PYTHON_FOR_BUILD_ONLY=         yes
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
-PYTHON_FOR_BUILD_ONLY?=        yes
-.include "../../devel/scons/buildlink3.mk"
+.include "../../devel/scons4/build.mk"
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"

Index: pkgsrc/multimedia/ffmpeg2theora/distinfo
diff -u pkgsrc/multimedia/ffmpeg2theora/distinfo:1.11 pkgsrc/multimedia/ffmpeg2theora/distinfo:1.12
--- pkgsrc/multimedia/ffmpeg2theora/distinfo:1.11       Tue Oct 26 11:01:01 2021
+++ pkgsrc/multimedia/ffmpeg2theora/distinfo    Mon Jul 24 15:18:38 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 11:01:01 nia Exp $
+$NetBSD: distinfo,v 1.12 2023/07/24 15:18:38 wiz Exp $
 
 BLAKE2s (ffmpeg2theora-0.30.tar.bz2) = c0a89b4ae9204a87b4b05cb105741c63d0bc5cd92fe183e668d996f75fe290c2
 SHA512 (ffmpeg2theora-0.30.tar.bz2) = 2c77d2c5e705751928e2bfd86c4fe4c2b7df2ca2ce70f3dfeb0014a3269eef067587eaa045c11b0db86c69176d8f01a43b3ad75544d181c016a89aa50b6518c1
 Size (ffmpeg2theora-0.30.tar.bz2) = 91269 bytes
-SHA1 (patch-SConstruct) = 3bec58615c8e855b127748bf54a523f215b41303
+SHA1 (patch-SConstruct) = 8adfa8ab0874a33c6722f03e0b40c982a0c2cf83
 SHA1 (patch-src_theorautils.c) = b46d6d2a3ac3ac42ede2c10fd0657379ee5645ea

Index: pkgsrc/multimedia/ffmpeg2theora/patches/patch-SConstruct
diff -u pkgsrc/multimedia/ffmpeg2theora/patches/patch-SConstruct:1.3 pkgsrc/multimedia/ffmpeg2theora/patches/patch-SConstruct:1.4
--- pkgsrc/multimedia/ffmpeg2theora/patches/patch-SConstruct:1.3        Sun Oct 22 12:59:33 2017
+++ pkgsrc/multimedia/ffmpeg2theora/patches/patch-SConstruct    Mon Jul 24 15:18:38 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-SConstruct,v 1.3 2017/10/22 12:59:33 tron Exp $
+$NetBSD: patch-SConstruct,v 1.4 2023/07/24 15:18:38 wiz Exp $
 
 - Preserve environment
 - Fix build with scons 3.0.0 or newer
 
 --- SConstruct.orig    2016-01-10 04:35:56.000000000 +0000
-+++ SConstruct 2017-10-22 13:56:55.000000000 +0100
-@@ -21,7 +21,7 @@
++++ SConstruct
+@@ -21,7 +21,7 @@ scons_version=(1,2,0)
  try:
      EnsureSConsVersion(*scons_version)
  except TypeError:
@@ -14,7 +14,7 @@ $NetBSD: patch-SConstruct,v 1.3 2017/10/
      Exit(2)
  
  opts = Variables()
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ opts.AddVariables(
    BoolVariable('libkate', 'enable libkate support', 1),
    BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
  )
@@ -23,7 +23,7 @@ $NetBSD: patch-SConstruct,v 1.3 2017/10/
  Help(opts.GenerateHelpText(env))
  
  pkg_flags="--cflags --libs"
-@@ -119,29 +119,29 @@
+@@ -119,29 +119,29 @@ if env["build_ffmpeg"]:
  if not env.GetOption('clean'):
    pkgconfig_version='0.15.0'
    if not conf.CheckPKGConfig(pkgconfig_version): 
@@ -59,7 +59,7 @@ $NetBSD: patch-SConstruct,v 1.3 2017/10/
      Exit(1) 
    ParsePKGConfig(env, XIPH_LIBS)
  
-@@ -177,13 +177,13 @@
+@@ -177,13 +177,13 @@ if not env.GetOption('clean'):
      FFMPEG_LIBS.append('libavresample')
  
    if not conf.CheckPKG(' '.join(FFMPEG_LIBS)): 
@@ -75,7 +75,7 @@ $NetBSD: patch-SConstruct,v 1.3 2017/10/
      Exit(1) 
  
    for lib in FFMPEG_LIBS:
-@@ -204,11 +204,11 @@
+@@ -204,11 +204,11 @@ if not env.GetOption('clean'):
        ParsePKGConfig(env, KATE_LIBS)
        env.Append(CCFLAGS=['-DHAVE_KATE', '-DHAVE_OGGKATE'])
      else:
@@ -89,3 +89,12 @@ $NetBSD: patch-SConstruct,v 1.3 2017/10/
  
    if conf.CheckCHeader('iconv.h'):
        env.Append(CCFLAGS=[
+@@ -222,6 +222,8 @@ if not env.GetOption('clean'):
+       env.Append(LIBS=['m'])
+   elif env['static']:
+       env.Append(LIBS=['m', 'dl'])
++  else:
++      env.Append(LIBS=['m'])
+ 
+ 
+ env = conf.Finish()