Date: Thu, 8 Nov 2012 00:10:13 -0500 (EST) From: Naram Qashat <cyberbotx@cyberbotx.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/173462: [PATCH] emulators/linux-pete-xgl2gpu: update to 2.9, take maintainership Message-ID: <20121108051013.313272845D@kirby.cyberbotx.com> Resent-Message-ID: <201211080520.qA85K0AE005487@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173462
>Category: ports
>Synopsis: [PATCH] emulators/linux-pete-xgl2gpu: update to 2.9, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 08 05:20:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Naram Qashat
>Release: FreeBSD 8.3-RELEASE-p4 amd64
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 8.3-RELEASE-p4 FreeBSD 8.3-RELEASE-p4 #4: Mon Oct 1 19:56:21 EDT
>Description:
- Update to 2.9
- Take maintainership
The reason for the added Makefile.inc is because 3 ports, this one,
emulators/linux-pete-mesagpu, and emulators/linux-peops-softgpu
share a common tarball for their configuration binaries.
Note: This PR superceeds PR ports/173459, that one should be closed.
Added file(s):
- Makefile.inc
Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:
--- linux-pete-xgl2gpu-2.9.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/emulators/linux-pete-xgl2gpu/Makefile ./Makefile
--- /usr/ports/emulators/linux-pete-xgl2gpu/Makefile 2012-10-07 17:07:38.000000000 -0400
+++ ./Makefile 2012-11-07 23:55:46.000000000 -0500
@@ -1,32 +1,28 @@
-# New ports collection makefile for: linux-pete-xgl2gpu
-# Date created: 16 Jul 2005
-# Whom: Jean-Yves Lefort <jylefort@FreeBSD.org>
-#
+# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
# $FreeBSD: head/emulators/linux-pete-xgl2gpu/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
-PORTNAME= linux-pete-xgl2gpu
-PORTVERSION= 2.8
+PORTNAME= pete-xgl2gpu
+PORTVERSION= ${XGL2GPU_VERSION}
CATEGORIES= emulators linux
MASTER_SITES= http://www.pbernert.com/
-DISTNAME= gpupetexgl${MAJOR}0${MINOR}
+PKGNAMEPREFIX= linux-
+DISTFILES= gpupetexgl${MAJOR}0${MINOR}${EXTRACT_SUFX} \
+ ${CFG_DISTFILE}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= cyberbotx@cyberbotx.com
COMMENT= A PSEmu Pro GPU plugin using a modern OpenGL renderer (Linux version)
-.if defined(WITH_NVIDIA_GL)
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-.else
-USE_LINUX_APPS+=dri
-.endif
-
NO_WRKSUBDIR= yes
NO_BUILD= yes
USE_LINUX= yes
USE_LINUX_APPS= gtk xorglibs
+PORTDOCS= *
ONLY_FOR_ARCHS= i386 amd64
+OPTIONS_DEFINE= NVIDIA_GL
+NVIDIA_GL_DESC= Use nVidia OpenGL driver
+
MAJOR= ${PORTVERSION:R}
MINOR= ${PORTVERSION:E}
PLIST_SUB+= MAJOR=${MAJOR} MINOR=${MINOR}
@@ -35,6 +31,16 @@
PSEMUPRO_CFGBINS_DIR= ${PREFIX}/libexec/psemupro/cfg
PSEMUPRO_CFGFILES_DIR= ${PREFIX}/share/psemupro/cfg
+.include <bsd.port.options.mk>
+
+.include "${.CURDIR}/../linux-pete-xgl2gpu/Makefile.inc"
+
+.if ${PORT_OPTIONS:MNVIDIA_GL}
+RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+.else
+USE_LINUX_APPS+=dri
+.endif
+
# by default, disable options which may crash the plugin
post-patch:
@${REINPLACE_CMD} -e '/^TWinShader/ s|= 1|= 0|' \
@@ -45,12 +51,12 @@
${INSTALL_PROGRAM} ${WRKSRC}/libgpuPeteXGL2.so.${MAJOR}.0.${MINOR} ${PSEMUPRO_PLUGINS_DIR}
${MKDIR} ${PSEMUPRO_CFGBINS_DIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/cfgPeteXGL2 ${PSEMUPRO_CFGBINS_DIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/cfg/cfgPeteXGL2 ${PSEMUPRO_CFGBINS_DIR}
${MKDIR} ${PSEMUPRO_CFGFILES_DIR}
${INSTALL_DATA} ${WRKSRC}/gpuPeteXGL2.cfg ${PSEMUPRO_CFGFILES_DIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
.endif
diff -ruN --exclude=CVS /usr/ports/emulators/linux-pete-xgl2gpu/Makefile.inc ./Makefile.inc
--- /usr/ports/emulators/linux-pete-xgl2gpu/Makefile.inc 1969-12-31 19:00:00.000000000 -0500
+++ ./Makefile.inc 2012-11-07 23:50:22.000000000 -0500
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+XGL2GPU_VERSION= 2.9
+MESAGPU_VERSION= 1.77
+SOFTGPU_VERSION= 1.18
+
+CFG_DISTFILE= petegpucfg_V${XGL2GPU_VERSION:C/\./-/}_V${MESAGPU_VERSION:C/\./-/}_V${SOFTGPU_VERSION:C/\./-/}${EXTRACT_SUFX}
diff -ruN --exclude=CVS /usr/ports/emulators/linux-pete-xgl2gpu/distinfo ./distinfo
--- /usr/ports/emulators/linux-pete-xgl2gpu/distinfo 2012-10-07 17:07:38.000000000 -0400
+++ ./distinfo 2012-11-08 00:04:35.000000000 -0500
@@ -1,2 +1,4 @@
-SHA256 (gpupetexgl208.tar.gz) = 01486fd9c644e44abd7aa303cbdccd4139d2a133b75f53436b6b8e5fb14dc9d0
-SIZE (gpupetexgl208.tar.gz) = 189449
+SHA256 (gpupetexgl209.tar.gz) = 83427665c31bbae16c1fbd7c695d0bc9acc4cfcf911302c031f852c850c9cc5d
+SIZE (gpupetexgl209.tar.gz) = 173744
+SHA256 (petegpucfg_V2-9_V1-77_V1-18.tar.gz) = 1488750fb2f158b68ef11b693fc1f45948ec41e84b1329315703adc91679fd91
+SIZE (petegpucfg_V2-9_V1-77_V1-18.tar.gz) = 59589
diff -ruN --exclude=CVS /usr/ports/emulators/linux-pete-xgl2gpu/pkg-plist ./pkg-plist
--- /usr/ports/emulators/linux-pete-xgl2gpu/pkg-plist 2012-10-07 17:07:38.000000000 -0400
+++ ./pkg-plist 2012-11-07 22:34:22.000000000 -0500
@@ -7,6 +7,3 @@
@dirrmtry libexec/psemupro
@dirrmtry share/psemupro/cfg
@dirrmtry share/psemupro
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/version.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- linux-pete-xgl2gpu-2.9.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121108051013.313272845D>