Wed Dec 21 14:14:18 2022 UTC ()
ogle: remove inline to fix build with gcc 10

Some pkglint cleanup while here.


(wiz)
diff -r1.43 -r1.44 pkgsrc/multimedia/ogle/Makefile
diff -r1.9 -r1.10 pkgsrc/multimedia/ogle/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/ogle/patches/patch-mpeg2__video_c__mlib.c
cvs diff -r1.43 -r1.44 pkgsrc/multimedia/ogle/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ogle/Makefile 2022/11/23 16:18:55 1.43
+++ pkgsrc/multimedia/ogle/Makefile 2022/12/21 14:14:17 1.44
@@ -1,54 +1,49 @@ @@ -1,54 +1,49 @@
1# $NetBSD: Makefile,v 1.43 2022/11/23 16:18:55 adam Exp $ 1# $NetBSD: Makefile,v 1.44 2022/12/21 14:14:17 wiz Exp $
2 2
3DISTNAME= ogle-0.9.2 3DISTNAME= ogle-0.9.2
4PKGREVISION= 15 4PKGREVISION= 15
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6#MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ 6#MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9#HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/ 9#HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/
10COMMENT= DVD player with menus 10COMMENT= DVD player with menus
11 
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14ONLY_FOR_PLATFORM+= NetBSD-*-i386 13ONLY_FOR_PLATFORM+= NetBSD-*-i386
15ONLY_FOR_PLATFORM+= NetBSD-*-powerpc 14ONLY_FOR_PLATFORM+= NetBSD-*-powerpc
16ONLY_FOR_PLATFORM+= NetBSD-*-alpha 15ONLY_FOR_PLATFORM+= NetBSD-*-alpha
17ONLY_FOR_PLATFORM+= NetBSD-*-sparc64 16ONLY_FOR_PLATFORM+= NetBSD-*-sparc64
18ONLY_FOR_PLATFORM+= NetBSD-*-x86_64 17ONLY_FOR_PLATFORM+= NetBSD-*-x86_64
19ONLY_FOR_PLATFORM+= Linux-*-* 18ONLY_FOR_PLATFORM+= Linux-*-*
20ONLY_FOR_PLATFORM+= SunOS-*-* DragonFly-*-* 19ONLY_FOR_PLATFORM+= SunOS-*-* DragonFly-*-*
21 20
22CPPFLAGS.NetBSD+= -D_KERNTYPES 21CPPFLAGS.NetBSD+= -D_KERNTYPES
23 22
24USE_TOOLS+= gmake 23USE_TOOLS+= gmake
25USE_LIBTOOL= yes 24USE_LIBTOOL= yes
26 25
27GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
28CONFIGURE_ENV+= CPPFLAGS=${CPPFLAGS:M*:Q} 27CONFIGURE_ENV+= CPPFLAGS=${CPPFLAGS:M*:Q}
29#CONFIGURE_ARGS+= --enable-obsdaudio 28#CONFIGURE_ARGS+= --enable-obsdaudio
30#CONFIGURE_ARGS+= --disable-sunaudio 29#CONFIGURE_ARGS+= --disable-sunaudio
31 30
32GCC_REQD+= 2.95.3 
33 
34.include "../../mk/compiler.mk" 31.include "../../mk/compiler.mk"
35 32
36.if !empty(CC_VERSION:Mgcc-4*) 33.if !empty(CC_VERSION:Mgcc-4*)
37WRAPPER_TRANSFORM_CMDS+= opt:-mcpu=pentiumpro:-mtune=pentiumpro 34WRAPPER_TRANSFORM_CMDS+= opt:-mcpu=pentiumpro:-mtune=pentiumpro
38.endif 35.endif
39 36
40MESSAGE_SUBST+= PKGBASE=${PKGBASE} 37MESSAGE_SUBST+= PKGBASE=${PKGBASE}
41 38
42BUILDLINK_API_DEPENDS.libdvdread+= libdvdread>=4.1.3 
43 
44.include "../../audio/liba52/buildlink3.mk" 39.include "../../audio/liba52/buildlink3.mk"
45.include "../../audio/libmad/buildlink3.mk" 40.include "../../audio/libmad/buildlink3.mk"
46.include "../../devel/gettext-lib/buildlink3.mk" 41.include "../../devel/gettext-lib/buildlink3.mk"
47.include "../../mk/jpeg.buildlink3.mk" 42.include "../../mk/jpeg.buildlink3.mk"
48.include "../../multimedia/libdvdread/buildlink3.mk" 43.include "../../multimedia/libdvdread/buildlink3.mk"
49.include "../../textproc/libxml2/buildlink3.mk" 44.include "../../textproc/libxml2/buildlink3.mk"
50.include "../../x11/libXext/buildlink3.mk" 45.include "../../x11/libXext/buildlink3.mk"
51.include "../../x11/libXinerama/buildlink3.mk" 46.include "../../x11/libXinerama/buildlink3.mk"
52.include "../../x11/libXv/buildlink3.mk" 47.include "../../x11/libXv/buildlink3.mk"
53.include "../../x11/libXxf86vm/buildlink3.mk" 48.include "../../x11/libXxf86vm/buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/multimedia/ogle/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/ogle/distinfo 2021/10/26 11:01:13 1.9
+++ pkgsrc/multimedia/ogle/distinfo 2022/12/21 14:14:17 1.10
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.9 2021/10/26 11:01:13 nia Exp $ 1$NetBSD: distinfo,v 1.10 2022/12/21 14:14:17 wiz Exp $
2 2
3BLAKE2s (ogle-0.9.2.tar.gz) = b375bde5cc169f689348ec4f72d52f12b9cb17616e7251dbcddd9cd996736a90 3BLAKE2s (ogle-0.9.2.tar.gz) = b375bde5cc169f689348ec4f72d52f12b9cb17616e7251dbcddd9cd996736a90
4SHA512 (ogle-0.9.2.tar.gz) = c933eed456e36126b4443361fb750309df869ac1dcba0172f0bd143c2ef830ab05e39f172f54bd372a1264b45931cb0b8fc44f8d7252d7a3655420ca794576b9 4SHA512 (ogle-0.9.2.tar.gz) = c933eed456e36126b4443361fb750309df869ac1dcba0172f0bd143c2ef830ab05e39f172f54bd372a1264b45931cb0b8fc44f8d7252d7a3655420ca794576b9
5Size (ogle-0.9.2.tar.gz) = 488984 bytes 5Size (ogle-0.9.2.tar.gz) = 488984 bytes
6SHA1 (patch-aa) = 95778b6a78f8d37416428bc27b709ed64bf4533a 6SHA1 (patch-aa) = 95778b6a78f8d37416428bc27b709ed64bf4533a
7SHA1 (patch-ab) = 0a4837639fd3e0dbab6ff804962f62fd7971582c 7SHA1 (patch-ab) = 0a4837639fd3e0dbab6ff804962f62fd7971582c
8SHA1 (patch-ac) = c30136ad38ff2238abfafe0fad419a4214acbb03 8SHA1 (patch-ac) = c30136ad38ff2238abfafe0fad419a4214acbb03
9SHA1 (patch-ad) = d1e9150f7544175f4bdf3b3fbc8fb3d072c04b5c 9SHA1 (patch-ad) = d1e9150f7544175f4bdf3b3fbc8fb3d072c04b5c
 10SHA1 (patch-mpeg2__video_c__mlib.c) = 3f3005d1b218c8823a6d4ecca70ee3785f089e30
File Added: pkgsrc/multimedia/ogle/patches/patch-mpeg2__video_c__mlib.c
$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,