CVS commit: pkgsrc/devel/py-game

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/py-game
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Wed, 27 Jul 2022 19:05:58 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul 27 19:05:58 UTC 2022

Modified Files:
        pkgsrc/devel/py-game: Makefile buildlink3.mk distinfo
        pkgsrc/devel/py-game/patches: patch-buildconfig_Setup.SDL1.in
            patch-buildconfig_config__darwin.py
            patch-buildconfig_config__unix.py

Log Message:
py-game: fix png library name.

Some pkglint cleanup while here.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/py-game/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/py-game/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/py-game/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/py-game/patches/patch-buildconfig_Setup.SDL1.in \
    pkgsrc/devel/py-game/patches/patch-buildconfig_config__darwin.py
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py

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

Modified files:

Index: pkgsrc/devel/py-game/Makefile
diff -u pkgsrc/devel/py-game/Makefile:1.40 pkgsrc/devel/py-game/Makefile:1.41
--- pkgsrc/devel/py-game/Makefile:1.40  Tue Jan  4 20:53:07 2022
+++ pkgsrc/devel/py-game/Makefile       Wed Jul 27 19:05:58 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2022/01/04 20:53:07 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2022/07/27 19:05:58 wiz Exp $
 
 DISTNAME=      pygame-1.9.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=   1
-CATEGORIES=    games python
+PKGREVISION=   2
+CATEGORIES=    devel games python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=P/Pygame/}
 
 MAINTAINER=    ryoon%NetBSD.org@localhost

Index: pkgsrc/devel/py-game/buildlink3.mk
diff -u pkgsrc/devel/py-game/buildlink3.mk:1.30 pkgsrc/devel/py-game/buildlink3.mk:1.31
--- pkgsrc/devel/py-game/buildlink3.mk:1.30     Tue Jun 20 22:37:53 2017
+++ pkgsrc/devel/py-game/buildlink3.mk  Wed Jul 27 19:05:58 2022
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.30 2017/06/20 22:37:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2022/07/27 19:05:58 wiz Exp $
 
-BUILDLINK_TREE+=       ${PYPKGPREFIX}-game
+BUILDLINK_TREE+=       py-game
 
 .if !defined(PY_GAME_BUILDLINK3_MK)
 PY_GAME_BUILDLINK3_MK:=
 
 .include "../../lang/python/pyversion.mk"
 
-BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-game+=    ${PYPKGPREFIX}-game>=1.9.1
-BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-game+=    ${PYPKGPREFIX}-game>=1.9.1nb2
-BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-game?=      ../../devel/py-game
+BUILDLINK_API_DEPENDS.py-game+=        ${PYPKGPREFIX}-game>=1.9.1
+BUILDLINK_ABI_DEPENDS.py-game+=        ${PYPKGPREFIX}-game>=1.9.1nb2
+BUILDLINK_PKGSRCDIR.py-game?=  ../../devel/py-game
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
@@ -22,4 +22,4 @@ BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-game?
 .endif
 .endif # PY_GAME_BUILDLINK3_MK
 
-BUILDLINK_TREE+=       -${PYPKGPREFIX}-game
+BUILDLINK_TREE+=       -py-game

Index: pkgsrc/devel/py-game/distinfo
diff -u pkgsrc/devel/py-game/distinfo:1.13 pkgsrc/devel/py-game/distinfo:1.14
--- pkgsrc/devel/py-game/distinfo:1.13  Tue Oct 26 10:18:29 2021
+++ pkgsrc/devel/py-game/distinfo       Wed Jul 27 19:05:58 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:18:29 nia Exp $
+$NetBSD: distinfo,v 1.14 2022/07/27 19:05:58 wiz Exp $
 
 BLAKE2s (pygame-1.9.6.tar.gz) = c0d6c76daada468ffda34e8610171057045782f63186f075d9354cbec94389f1
 SHA512 (pygame-1.9.6.tar.gz) = d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0
 Size (pygame-1.9.6.tar.gz) = 3223131 bytes
-SHA1 (patch-buildconfig_Setup.SDL1.in) = 2f4b60f933952b67092fabfe4c84d7525b9d0338
+SHA1 (patch-buildconfig_Setup.SDL1.in) = 185fe6e5d61fdbaab8884584c34d3925d8a73828
 SHA1 (patch-buildconfig_Setup.SDL2.in) = 9b33e714df4319622aac66ced2b3ce36f879dc8c
-SHA1 (patch-buildconfig_config__darwin.py) = c1e8ac90619fce59e250a33175a546cd235c0fe1
-SHA1 (patch-buildconfig_config__unix.py) = 1072834d9eb38170a4bc650c9dea0992f3e0aba8
+SHA1 (patch-buildconfig_config__darwin.py) = 181c99f91473e6e6a12ddb345858cecfe6edc6bf
+SHA1 (patch-buildconfig_config__unix.py) = 2f47293c343bbfdea048f75166082139fcbf94fb

Index: pkgsrc/devel/py-game/patches/patch-buildconfig_Setup.SDL1.in
diff -u pkgsrc/devel/py-game/patches/patch-buildconfig_Setup.SDL1.in:1.1 pkgsrc/devel/py-game/patches/patch-buildconfig_Setup.SDL1.in:1.2
--- pkgsrc/devel/py-game/patches/patch-buildconfig_Setup.SDL1.in:1.1    Thu Jun  6 21:46:12 2019
+++ pkgsrc/devel/py-game/patches/patch-buildconfig_Setup.SDL1.in        Wed Jul 27 19:05:58 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-buildconfig_Setup.SDL1.in,v 1.1 2019/06/06 21:46:12 adam Exp $
+$NetBSD: patch-buildconfig_Setup.SDL1.in,v 1.2 2022/07/27 19:05:58 wiz Exp $
 
 Disable portmidi/porttime
 
---- buildconfig/Setup.SDL1.in.orig     2019-06-06 17:51:10.000000000 +0000
+--- buildconfig/Setup.SDL1.in.orig     2019-04-25 06:14:17.000000000 +0000
 +++ buildconfig/Setup.SDL1.in
 @@ -7,15 +7,13 @@
  
@@ -13,7 +13,8 @@ Disable portmidi/porttime
  FONT = -lSDL_ttf
  IMAGE = -lSDL_image
  MIXER = -lSDL_mixer
- PNG = -lpng
+-PNG = -lpng
++PNG = -lpng16
  JPEG = -ljpeg
  SCRAP = -lX11
 -PORTMIDI = -lportmidi
Index: pkgsrc/devel/py-game/patches/patch-buildconfig_config__darwin.py
diff -u pkgsrc/devel/py-game/patches/patch-buildconfig_config__darwin.py:1.1 pkgsrc/devel/py-game/patches/patch-buildconfig_config__darwin.py:1.2
--- pkgsrc/devel/py-game/patches/patch-buildconfig_config__darwin.py:1.1        Thu Jun  6 21:46:12 2019
+++ pkgsrc/devel/py-game/patches/patch-buildconfig_config__darwin.py    Wed Jul 27 19:05:58 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-buildconfig_config__darwin.py,v 1.1 2019/06/06 21:46:12 adam Exp $
+$NetBSD: patch-buildconfig_config__darwin.py,v 1.2 2022/07/27 19:05:58 wiz Exp $
 
 Use correct libpng.
 
@@ -9,7 +9,7 @@ Use correct libpng.
          FrameworkDependency('PORTTIME', 'CoreMidi.h', 'CoreMidi', 'CoreMIDI'),
          FrameworkDependency('QUICKTIME', 'QuickTime.h', 'QuickTime', 'QuickTime'),
 -        Dependency('PNG', 'png.h', 'libpng', ['png']),
-+        Dependency('PNG', 'png.h', 'libpng16', ['png']),
++        Dependency('PNG', 'png.h', 'libpng16', ['png16']),
          Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
          Dependency('PORTMIDI', 'portmidi.h', 'libportmidi', ['portmidi']),
          find_freetype(),

Index: pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py
diff -u pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py:1.2 pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py:1.3
--- pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py:1.2  Mon Jun 22 11:33:41 2020
+++ pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py      Wed Jul 27 19:05:58 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-buildconfig_config__unix.py,v 1.2 2020/06/22 11:33:41 ryoon Exp $
+$NetBSD: patch-buildconfig_config__unix.py,v 1.3 2022/07/27 19:05:58 wiz Exp $
 
 Detect X11R6 or X11R7; avoid localbase overriding search.
 Use correct libpng.
@@ -27,7 +27,7 @@ Disable portmidi and porttime; porttime 
          ]
      DEPS.extend([
 -        Dependency('PNG', 'png.h', 'libpng', ['png']),
-+        Dependency('PNG', 'png.h', 'libpng16', ['png']),
++        Dependency('PNG', 'png.h', 'libpng16', ['png16']),
          Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
          Dependency('SCRAP', '', 'libX11', ['X11']),
          #Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL_gfx.so', ['SDL_gfx']),

Prev by Date: CVS commit: pkgsrc/converters
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/converters
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index