Update to gamine-1.6.

One less consumer of the old gstreamer-0.10.
This commit is contained in:
ajacoutot 2019-03-05 13:47:11 +00:00
parent d69b897d18
commit 35704f3d89
6 changed files with 119 additions and 58 deletions

View File

@ -1,51 +1,42 @@
# $OpenBSD: Makefile,v 1.17 2018/06/29 22:16:13 espie Exp $
# $OpenBSD: Makefile,v 1.18 2019/03/05 13:47:11 ajacoutot Exp $
COMMENT= interactive game for young children
COMMENT= interactive game for young children
DISTNAME= gamine-1.1
REVISION= 13
DISTNAME= gamine-1.6
CATEGORIES= games
CATEGORIES= games
HOMEPAGE= http://gnunux.info/projets/gamine/
# DWTFYWTPL
# (DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE)
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
WANTLIB = GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo drm expat
WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gstreamer-0.10 gthread-2.0
WANTLIB += gtk-x11-2.0 iconv intl m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pixman-1 png pthread xcb xcb-render xcb-shm xml2
WANTLIB += z
WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gstreamer-1.0 gtk-3 intl
WANTLIB += m pango-1.0 pangocairo-1.0
MASTER_SITES= ${HOMEPAGE}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gamine-game/}
MODULES= devel/gconf2
BUILD_DEPENDS= devel/gettext-tools
BUILD_DEPENDS= devel/gettext-tools
RUN_DEPENDS= devel/desktop-file-utils \
x11/gtk+3,-guic
RUN_DEPENDS= devel/desktop-file-utils \
multimedia/gstreamer-0.10/plugins-good \
x11/gtk+3,-guic
# sndio(7) support
RUN_DEPENDS += multimedia/gstreamer1/plugins-base
LIB_DEPENDS= multimedia/gstreamer-0.10/core \
x11/gtk+2
LIB_DEPENDS= multimedia/gstreamer1/core \
x11/gtk+3
USE_GMAKE= Yes
ALL_TARGET= # empty
USE_GMAKE= Yes
ALL_TARGET= # empty
NO_TEST= Yes
MODGCONF2_SCHEMAS_DIR= gamine
MAKE_FLAGS= CC=${CC} \
CFLAGS="${CFLAGS}" \
PREFIX=${PREFIX} CC=${CC} \
SYSCONFDIR=${SYSCONFDIR}
MAKE_FLAGS= PREFIX=${PREFIX} CC=${CC} CFLAGS="${CFLAGS}" \
GCONFTOOL=/usr/bin/true \
GCONF_SCHEMA_FILE_DIR=${LOCALBASE}/${SCHEMAS_INSTDIR} \
sysconfdir=${SYSCONFDIR}
FAKE_FLAGS= PREFIX=${WRKINST}${PREFIX} \
GCONF_SCHEMA_FILE_DIR=${WRKINST}${PREFIX}/${SCHEMAS_INSTDIR} \
sysconfdir=${PREFIX}/share/examples/gamine
FAKE_FLAGS= PREFIX=${PREFIX} \
MANDIR=${PREFIX}/man/man6 \
SYSCONFDIR=${PREFIX}/share/examples/gamine
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (gamine-1.1.tar.gz) = +IPpSoK4jpkqwEKuH5wYE97vt1/WjwMRkacoaB95rCg=
SIZE (gamine-1.1.tar.gz) = 5076636
SHA256 (gamine-1.6.tar.gz) = tkyq3WDjrheqS3IvoK+ZkExDjkgxA+5NezGyQghxhuk=
SIZE (gamine-1.6.tar.gz) = 5111554

View File

@ -1,17 +1,24 @@
$OpenBSD: patch-Makefile,v 1.2 2017/11/03 12:49:10 espie Exp $
$OpenBSD: patch-Makefile,v 1.3 2019/03/05 13:47:11 ajacoutot Exp $
- add an explicit -lm for lld
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -14,8 +14,8 @@ GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas
GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = 0
CFLAGS = -Wall
#CFLAGS = -Wall -g
-CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0) -DDATADIR=\""$(pkgdatadir)"\" -DLOCALDIR=\""$(localedir)"\"
-LDLIBS = $(shell pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0) -DDATADIR=\""$(pkgdatadir)"\" -DLOCALDIR=\""$(localedir)"\"
+CPPFLAGS = `pkg-config --cflags gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0` -DDATADIR=\""$(pkgdatadir)"\" -DLOCALDIR=\""$(localedir)"\"
+LDLIBS = `pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0` -DDATADIR=\""$(pkgdatadir)"\" -DLOCALDIR=\""$(localedir)"\" -lm
@@ -11,13 +11,13 @@ LOCALEDIR = $(DATADIR)/locale
MANDIR = $(DATADIR)/man/man6
CFLAGS = -Wall -g
-CPPFLAGS = $(shell pkg-config --cflags gtk+-3.0 cairo glib-2.0 gstreamer-1.0) -DDATADIR=\""$(PKGDATADIR)"\" -DLOCALDIR=\""$(LOCALEDIR)"\" -DSYSCONFDIR=\""$(SYSCONFDIR)"\"
-LDLIBS = $(shell pkg-config --libs gtk+-3.0 cairo glib-2.0 gstreamer-1.0) -DDATADIR=\""$(PKGDATADIR)"\" -DLOCALDIR=\""$(LOCALEDIR)"\" -DSYSCONFDIR=\""$(SYSCONFDIR)"\" -lm
+CPPFLAGS = $$(pkg-config --cflags gtk+-3.0 cairo glib-2.0 gstreamer-1.0) -DDATADIR=\""$(PKGDATADIR)"\" -DLOCALDIR=\""$(LOCALEDIR)"\" -DSYSCONFDIR=\""$(SYSCONFDIR)"\"
+LDLIBS = $$(pkg-config --libs gtk+-3.0 cairo glib-2.0 gstreamer-1.0) -DDATADIR=\""$(PKGDATADIR)"\" -DLOCALDIR=\""$(LOCALEDIR)"\" -DSYSCONFDIR=\""$(SYSCONFDIR)"\" -lm
LDFLAGS = -g
CC = gcc
target = gamine
objs = gamine.o
-langs = $(shell ls locale|grep -v pot|cut -d "." --field=1)
+langs = $$(ls locale|grep -v pot|cut -d "." -f 1)
$(target): $(objs)
$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-gen_desktop_sh,v 1.1 2019/03/05 13:47:11 ajacoutot Exp $
Index: gen_desktop.sh
--- gen_desktop.sh.orig
+++ gen_desktop.sh
@@ -3,7 +3,7 @@
# This script generates gamine.desktop file using gamine.desktop.in template and po files
rm -f gamine.desktop
-echo `ls ./locale|grep .po|grep -v .pot|cut -d "." --fields=1` > ./locale/LINGUAS
+echo `ls ./locale|grep .po|grep -v .pot|cut -d "." -f 1` > ./locale/LINGUAS
msgfmt --desktop -d ./locale --template gamine.desktop.in -o gamine.desktop
rm -f ./locale/LINGUAS
# compatibility with old gettext

View File

@ -1,3 +1,4 @@
Gamine is a game designed for 2 years old children who are not able to
use mouse and keyboard. The child uses the mouse to draw coloured dots
and lines on the screen and keyboard to display letter.
Gamine is a game designed for 2 years old children who are not able to use mouse
and keyboard. The child uses the mouse to draw coloured dots and lines on the
screen and keyboard to display letter.
Let youngest children discover how to move mouse and use keyboard.

View File

@ -1,12 +1,18 @@
@comment $OpenBSD: PLIST,v 1.6 2018/06/29 22:16:13 espie Exp $
@comment $OpenBSD: PLIST,v 1.7 2019/03/05 13:47:11 ajacoutot Exp $
@bin bin/gamine
@man man/man6/gamine.6
share/applications/gamine.desktop
share/doc/gamine/
share/doc/gamine/AUTHORS
share/doc/gamine/COPYING
share/doc/gamine/ChangeLog
share/doc/gamine/README
share/doc/gamine/README.locale
share/doc/gamine/README.pencil
share/doc/gamine/README.sounds
share/examples/gamine/
share/examples/gamine/gamine.conf
@sample ${SYSCONFDIR}/gamine.conf
share/gamine/
share/gamine/gamine.png
share/gamine/pencil.png
@ -34,15 +40,57 @@ share/gamine/sounds/receive.wav
share/gamine/sounds/tri.ogg
share/gamine/sounds/tuxok.wav
share/gamine/sounds/youcannot.wav
share/icons/
share/icons/hicolor/
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/gamine.svg
share/locale/ast/LC_MESSAGES/gamine.mo
share/locale/az/LC_MESSAGES/gamine.mo
share/locale/be/LC_MESSAGES/gamine.mo
share/locale/bg/LC_MESSAGES/gamine.mo
share/locale/br/LC_MESSAGES/gamine.mo
share/locale/cs/LC_MESSAGES/gamine.mo
share/locale/da/LC_MESSAGES/gamine.mo
share/locale/de/LC_MESSAGES/gamine.mo
share/locale/el/LC_MESSAGES/gamine.mo
share/locale/eo/LC_MESSAGES/gamine.mo
share/locale/es/LC_MESSAGES/gamine.mo
share/locale/et/LC_MESSAGES/gamine.mo
share/locale/eu/LC_MESSAGES/gamine.mo
share/locale/fa/LC_MESSAGES/gamine.mo
share/locale/fi/LC_MESSAGES/gamine.mo
share/locale/fo/LC_MESSAGES/gamine.mo
share/locale/fr/LC_MESSAGES/gamine.mo
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas >/dev/null 2>&1
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/gamine.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas >/dev/null 2>&1
share/locale/gl/LC_MESSAGES/gamine.mo
share/locale/hr/LC_MESSAGES/gamine.mo
share/locale/hu/LC_MESSAGES/gamine.mo
share/locale/hy/LC_MESSAGES/gamine.mo
share/locale/id/LC_MESSAGES/gamine.mo
share/locale/is/LC_MESSAGES/gamine.mo
share/locale/it/LC_MESSAGES/gamine.mo
share/locale/ja/LC_MESSAGES/gamine.mo
share/locale/lt/LC_MESSAGES/gamine.mo
share/locale/lv/LC_MESSAGES/gamine.mo
share/locale/mk/LC_MESSAGES/gamine.mo
share/locale/ms/LC_MESSAGES/gamine.mo
share/locale/nb/LC_MESSAGES/gamine.mo
share/locale/nl/LC_MESSAGES/gamine.mo
share/locale/oc/LC_MESSAGES/gamine.mo
share/locale/pl/LC_MESSAGES/gamine.mo
share/locale/pt/LC_MESSAGES/gamine.mo
share/locale/pt_BR/LC_MESSAGES/gamine.mo
share/locale/pt_PT/
share/locale/pt_PT/LC_MESSAGES/
share/locale/pt_PT/LC_MESSAGES/gamine.mo
share/locale/ro/LC_MESSAGES/gamine.mo
share/locale/ru/LC_MESSAGES/gamine.mo
share/locale/sl/LC_MESSAGES/gamine.mo
share/locale/sr/LC_MESSAGES/gamine.mo
share/locale/sv/LC_MESSAGES/gamine.mo
share/locale/te/LC_MESSAGES/gamine.mo
share/locale/th/LC_MESSAGES/gamine.mo
share/locale/tr/LC_MESSAGES/gamine.mo
share/locale/uk/LC_MESSAGES/gamine.mo
share/locale/vi/LC_MESSAGES/gamine.mo
share/locale/zh_CN/LC_MESSAGES/gamine.mo
share/locale/zh_HK/LC_MESSAGES/gamine.mo
share/locale/zh_TW/LC_MESSAGES/gamine.mo
@tag gtk-update-icon-cache %D/share/icons/hicolor
@tag update-desktop-database