CVS commit: pkgsrc/multimedia/ogle

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Dec 21 14:14:18 UTC 2022

Modified Files:
        pkgsrc/multimedia/ogle: Makefile distinfo
Added Files:
        pkgsrc/multimedia/ogle/patches: patch-mpeg2__video_c__mlib.c

Log Message:
ogle: remove inline to fix build with gcc 10

Some pkglint cleanup while here.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/multimedia/ogle/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/multimedia/ogle/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/ogle/patches/patch-mpeg2__video_c__mlib.c

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

Modified files:

Index: pkgsrc/multimedia/ogle/Makefile
diff -u pkgsrc/multimedia/ogle/Makefile:1.43 pkgsrc/multimedia/ogle/Makefile:1.44
--- pkgsrc/multimedia/ogle/Makefile:1.43        Wed Nov 23 16:18:55 2022
+++ pkgsrc/multimedia/ogle/Makefile     Wed Dec 21 14:14:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2022/11/23 16:18:55 adam Exp $
+# $NetBSD: Makefile,v 1.44 2022/12/21 14:14:17 wiz Exp $
 
 DISTNAME=      ogle-0.9.2
 PKGREVISION=   15
@@ -8,7 +8,6 @@ CATEGORIES=     multimedia
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 #HOMEPAGE=     http://www.dtek.chalmers.se/groups/dvd/
 COMMENT=       DVD player with menus
-
 LICENSE=       gnu-gpl-v2
 
 ONLY_FOR_PLATFORM+=    NetBSD-*-i386
@@ -29,8 +28,6 @@ CONFIGURE_ENV+=               CPPFLAGS=${CPPFLAGS:M*:
 #CONFIGURE_ARGS+=      --enable-obsdaudio
 #CONFIGURE_ARGS+=      --disable-sunaudio
 
-GCC_REQD+=             2.95.3
-
 .include "../../mk/compiler.mk"
 
 .if !empty(CC_VERSION:Mgcc-4*)
@@ -39,8 +36,6 @@ WRAPPER_TRANSFORM_CMDS+=      opt:-mcpu=penti
 
 MESSAGE_SUBST+=                PKGBASE=${PKGBASE}
 
-BUILDLINK_API_DEPENDS.libdvdread+=     libdvdread>=4.1.3
-
 .include "../../audio/liba52/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/multimedia/ogle/distinfo
diff -u pkgsrc/multimedia/ogle/distinfo:1.9 pkgsrc/multimedia/ogle/distinfo:1.10
--- pkgsrc/multimedia/ogle/distinfo:1.9 Tue Oct 26 11:01:13 2021
+++ pkgsrc/multimedia/ogle/distinfo     Wed Dec 21 14:14:17 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:01:13 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/12/21 14:14:17 wiz Exp $
 
 BLAKE2s (ogle-0.9.2.tar.gz) = b375bde5cc169f689348ec4f72d52f12b9cb17616e7251dbcddd9cd996736a90
 SHA512 (ogle-0.9.2.tar.gz) = c933eed456e36126b4443361fb750309df869ac1dcba0172f0bd143c2ef830ab05e39f172f54bd372a1264b45931cb0b8fc44f8d7252d7a3655420ca794576b9
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 95778b6a78f8d37416428b
 SHA1 (patch-ab) = 0a4837639fd3e0dbab6ff804962f62fd7971582c
 SHA1 (patch-ac) = c30136ad38ff2238abfafe0fad419a4214acbb03
 SHA1 (patch-ad) = d1e9150f7544175f4bdf3b3fbc8fb3d072c04b5c
+SHA1 (patch-mpeg2__video_c__mlib.c) = 3f3005d1b218c8823a6d4ecca70ee3785f089e30

Added files:

Index: pkgsrc/multimedia/ogle/patches/patch-mpeg2__video_c__mlib.c
diff -u /dev/null pkgsrc/multimedia/ogle/patches/patch-mpeg2__video_c__mlib.c:1.1
--- /dev/null   Wed Dec 21 14:14:18 2022
+++ pkgsrc/multimedia/ogle/patches/patch-mpeg2__video_c__mlib.c Wed Dec 21 14:14:17 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-mpeg2__video_c__mlib.c,v 1.1 2022/12/21 14:14:17 wiz Exp $
+
+Remove inline to fix build with gcc 10.
+
+--- mpeg2_video/c_mlib.c.orig  2003-02-15 21:42:30.000000000 +0000
++++ mpeg2_video/c_mlib.c
+@@ -75,7 +75,7 @@ mlib_Init(void)
+ {
+ }
+ 
+-inline void
++void
+ mlib_VideoCopyRef_U8_U8 (uint8_t *curr_block,
+                          const uint8_t *ref_block,
+                          const int32_t width,