1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

- Update to svn rev. 84102

- Use new Makefile header format

Feature safe:	yes
This commit is contained in:
Ganael LAPLANCHE 2013-04-19 07:40:04 +00:00
parent 5dc3dbfaf5
commit 2a77ee7578
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=316088
12 changed files with 26 additions and 43 deletions

View File

@ -1,12 +1,8 @@
# New ports collection makefile for: pcsxr
# Date created: 11 June 2010
# Whom: Ganael Laplanche <ganael.laplanche@martymac.org>
#
# Created by: Ganael Laplanche <ganael.laplanche@martymac.org>
# $FreeBSD$
#
PORTNAME= pcsxr
PORTVERSION= 1.9.92.r81088
PORTVERSION= 1.9.92.r84102
CATEGORIES= emulators
MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
LOCAL/martymac
@ -35,7 +31,7 @@ USE_LDCONFIG= yes
USE_DOS2UNIX= yes
DOS2UNIX_REGEX= .*\.(c|h|cpp|hpp|am)
USE_GNOME= gtk20 desktopfileutils glib20
USE_GNOME= gtk30 desktopfileutils glib20
USE_ICONV= yes
USE_XORG= x11 xv xext xxf86vm xtst
USE_SDL= sdl

View File

@ -1,2 +1,2 @@
SHA256 (pcsxr-1.9.92.r81088.tar.bz2) = d514fd045f0dd4fe9c7f8d67afbe031412f38f039b3a53c0007c267366e9595d
SIZE (pcsxr-1.9.92.r81088.tar.bz2) = 1435621
SHA256 (pcsxr-1.9.92.r84102.tar.bz2) = 88c86c5221f16b2d9d3c88191b7e5e08f4f62c71e17c084188497abb0e6c3295
SIZE (pcsxr-1.9.92.r84102.tar.bz2) = 1451311

View File

@ -2,7 +2,7 @@
+++ gui/Makefile.am 2011-06-30 11:43:02.263535649 +0200
@@ -3,8 +3,8 @@
-DLOCALE_DIR=\"${datadir}/locale/\" \
$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
$(GTK3_CFLAGS) $(GLADE2_CFLAGS) \
-I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \
- -DPSEMU_DATA_DIR=\"${datadir}/psemu\" \
- -DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\"
@ -15,6 +15,6 @@
pcsxr_LDADD = \
../libpcsxcore/libpcsxcore.a \
- $(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst
+ $(GTK2_LIBS) $(GLADE2_LIBS) -lz -lm -lXext -lXtst -lGL
- $(GTK3_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst
+ $(GTK3_LIBS) $(GLADE2_LIBS) -lz -lm -lXext -lXtst -lGL
+pcsxr_LDFLAGS = -pthread

View File

@ -14,11 +14,11 @@
AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
- -DDATADIR=\"${datadir}/psemu/\" \
+ -DDATADIR=\"${datadir}/pcsxr/\" \
$(GTK2_CFLAGS) \
$(GTK3_CFLAGS) \
-I../../libpcsxcore -I../../include
@@ -16,5 +16,5 @@
cfgBladeSio1_LDADD = $(GTK2_LIBS)
cfgBladeSio1_LDADD = $(GTK3_LIBS)
glade_DATA = sio1.ui
-gladedir = $(datadir)/psemu/

View File

@ -25,11 +25,11 @@
AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
- -DDATADIR=\"${datadir}/psemu/\" \
+ -DDATADIR=\"${datadir}/pcsxr/\" \
$(GTK2_CFLAGS) \
$(GTK3_CFLAGS) \
-I../../libpcsxcore -I../../include
@@ -31,5 +31,5 @@
cfgDFCdrom_LDADD = $(GTK2_LIBS)
cfgDFCdrom_LDADD = $(GTK3_LIBS)
glade_DATA = cdrcfg-0.1df/dfcdrom.ui
-gladedir = $(datadir)/psemu/

View File

@ -17,11 +17,11 @@
AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
- -DDATADIR=\"${datadir}/psemu/\" \
+ -DDATADIR=\"${datadir}/pcsxr/\" \
$(GTK2_CFLAGS) \
$(GTK3_CFLAGS) \
-I../../include -I../../libpcsxcore $(SDL_CFLAGS)
@@ -17,5 +17,5 @@
cfgDFInput_LDADD = $(GTK2_LIBS) $(SDL_LIBS) -lX11
cfgDFInput_LDADD = $(GTK3_LIBS) $(SDL_LIBS) -lX11
glade_DATA = dfinput.ui
-gladedir = $(datadir)/psemu/

View File

@ -1,15 +1,6 @@
--- plugins/dfinput/pad.c.orig 2012-11-08 06:07:00.000000000 +0100
+++ plugins/dfinput/pad.c 2012-11-08 06:09:26.000000000 +0100
@@ -676,8 +676,6 @@
} else if (pid > 0) {
waitpid(pid, NULL, 0);
}
-
- return PSE_PAD_ERR_SUCCESS;
}
#endif
@@ -685,3 +683,6 @@
--- plugins/dfinput/pad.c.orig 2013-04-17 16:44:04.000000000 +0200
+++ plugins/dfinput/pad.c 2013-04-17 16:46:50.000000000 +0200
@@ -683,3 +683,6 @@
long PADtest(void) {
return PSE_PAD_ERR_SUCCESS;
}

View File

@ -14,11 +14,11 @@
AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
- -DDATADIR=\"${datadir}/psemu/\" \
+ -DDATADIR=\"${datadir}/pcsxr/\" \
$(GTK2_CFLAGS) \
$(GTK3_CFLAGS) \
-I../../libpcsxcore -I../../include
@@ -16,5 +16,5 @@
cfgDFNet_LDADD = $(GTK2_LIBS)
cfgDFNet_LDADD = $(GTK3_LIBS)
glade_DATA = dfnet.ui
-gladedir = $(datadir)/psemu/

View File

@ -26,9 +26,9 @@
cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
- -DDATADIR=\"${datadir}/psemu/\" \
+ -DDATADIR=\"${datadir}/pcsxr/\" \
$(GTK2_CFLAGS) $(AM_CPPFLAGS)
$(GTK3_CFLAGS) $(AM_CPPFLAGS)
cfgDFSound_SOURCES = spucfg-0.1df/main.c
cfgDFSound_LDADD = $(GTK2_LIBS)
cfgDFSound_LDADD = $(GTK3_LIBS)
glade_DATA = spucfg-0.1df/dfsound.ui
-gladedir = $(datadir)/psemu/

View File

@ -6,7 +6,7 @@
AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
- -DDATADIR=\"${datadir}/psemu/\" \
+ -DDATADIR=\"${datadir}/pcsxr/\" \
$(GTK2_CFLAGS)\
$(GTK3_CFLAGS)\
-I../../libpcsxcore \
-I../../include
@ -18,7 +18,7 @@
lib_LTLIBRARIES = libDFXVideo.la
@@ -30,5 +30,5 @@
cfgDFXVideo_LDADD = $(GTK2_LIBS) -lXext
cfgDFXVideo_LDADD = $(GTK3_LIBS) -lXext
glade_DATA = gpucfg-0.1df/dfxvideo.ui
-gladedir = $(datadir)/psemu/

View File

@ -5,7 +5,7 @@
-DLOCALE_DIR=\"${datadir}/locale/\" \
- -DDATADIR=\"${datadir}/psemu/\" \
+ -DDATADIR=\"${datadir}/pcsxr/\" \
$(GTK2_CFLAGS) \
$(GTK3_CFLAGS) \
-I../../libpcsxcore -I../../include
-bindir = @libdir@/games/psemu/
@ -16,7 +16,7 @@
lib_LTLIBRARIES = libpeopsxgl.la
@@ -19,5 +19,5 @@
cfgpeopsxgl_LDADD = $(GTK2_LIBS)
cfgpeopsxgl_LDADD = $(GTK3_LIBS)
glade_DATA = gpucfg/peopsxgl.ui
-gladedir = $(datadir)/psemu/

View File

@ -15,10 +15,10 @@ share/pcsxr/dfinput.ui
share/pcsxr/dfnet.ui
share/pcsxr/dfxvideo.ui
share/pcsxr/dfcdrom.ui
share/pcsxr/sio1.ui
share/pcsxr/gpu.png
share/pcsxr/dfsound.ui
share/pcsxr/spu.png
share/pcsxr/sio1.png
share/pcsxr/cd.png
share/pcsxr/iso-reopen.png
share/pcsxr/cdr.png
@ -38,7 +38,6 @@ lib/pcsxr/cfgDFInput
lib/pcsxr/cfgDFCdrom
lib/pcsxr/cfgDFSound
lib/pcsxr/cfgDFNet
lib/pcsxr/cfgBladeSio1
lib/pcsxr/libDFXVideo.a
lib/pcsxr/libDFXVideo.la
lib/pcsxr/libDFXVideo.so
@ -57,9 +56,6 @@ lib/pcsxr/libDFCdrom.so
lib/pcsxr/libDFNet.a
lib/pcsxr/libDFNet.la
lib/pcsxr/libDFNet.so
lib/pcsxr/libBladeSio1.a
lib/pcsxr/libBladeSio1.la
lib/pcsxr/libBladeSio1.so
@dirrm lib/pcsxr
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true