Update to 1.9.92.r68256

This commit is contained in:
Ganael LAPLANCHE 2011-07-01 10:13:22 +00:00
parent e6a3328b18
commit eb1c2e8fe7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=276776
10 changed files with 67 additions and 67 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= pcsxr
PORTVERSION= 1.9.92.r62569
PORTVERSION= 1.9.92.r68256
CATEGORIES= emulators
MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
LOCAL/martymac
@ -37,7 +37,7 @@ CONFIGURE_ARGS= --enable-opengl --enable-libcdio
USE_LDCONFIG= yes
USE_DOS2UNIX= yes
DOS2UNIX_REGEX= .*\.(c|h|cpp|hpp)
DOS2UNIX_REGEX= .*\.(c|h|cpp|hpp|am)
USE_GNOME= gtk20 desktopfileutils glib20 libglade2
USE_ICONV= yes
@ -45,7 +45,7 @@ USE_XORG= x11 xv xext xxf86vm xtst
USE_SDL= sdl
USE_GL= gl
MAN1= pcsx.1
MAN1= pcsxr.1
PORTDOCS= ChangeLog README
# Default CDROM device to use with dfcdrom,

View file

@ -1,4 +1,4 @@
SHA256 (pcsxr-1.9.92.r62569.tar.bz2) = 2250c7535e4687623704299595a5395f130e73bc7277ac79d7285428bd150251
SIZE (pcsxr-1.9.92.r62569.tar.bz2) = 1345120
SHA256 (pcsxr-1.9.92.r68256.tar.bz2) = 235ef8e4d3612253f0f24cf3046408a502a71d5b4df8d68c04e66830c9830e0b
SIZE (pcsxr-1.9.92.r68256.tar.bz2) = 1482379
SHA256 (pcsx-df-1.10-plugin-dfbinimage2.tar.bz2) = 175b71a0a6aff1defdf4d8f9246fcc259fb72876c7ba0bcf607b1e1228fa5a9f
SIZE (pcsx-df-1.10-plugin-dfbinimage2.tar.bz2) = 40654

View file

@ -1,9 +0,0 @@
--- data/Makefile.am.orig 2010-05-26 06:02:22.954270724 +0000
+++ data/Makefile.am 2010-05-26 06:02:46.484204835 +0000
@@ -1,5 +1,5 @@
glade_DATA = pcsx.glade2
-gladedir = $(datadir)/pcsx
+gladedir = $(datadir)/pcsxr
desktopdir = $(datadir)/applications
desktop_DATA = pcsx.desktop

View file

@ -1,9 +1,6 @@
--- gui/Makefile.am.orig 2011-01-25 07:07:29.144904305 +0100
+++ gui/Makefile.am 2011-01-25 07:15:13.989942292 +0100
@@ -1,10 +1,10 @@
-AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
+AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${datadir}/pcsxr/\" \
-DPIXMAPDIR=\"${datadir}/pixmaps/\" \
--- gui/Makefile.am.orig 2011-06-30 08:47:19.000000000 +0200
+++ gui/Makefile.am 2011-06-30 11:43:02.263535649 +0200
@@ -3,8 +3,8 @@
-DLOCALE_DIR=\"${datadir}/locale/\" \
$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
-I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \
@ -12,12 +9,12 @@
+ -DPSEMU_DATA_DIR=\"${datadir}/pcsxr\" \
+ -DDEF_PLUGIN_DIR=\"${libdir}/pcsxr\"
bin_PROGRAMS = pcsx
bin_PROGRAMS = pcsxr
@@ -21,4 +21,5 @@
@@ -29,4 +29,5 @@
pcsx_LDADD = \
pcsxr_LDADD = \
../libpcsxcore/libpcsxcore.a \
- $(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst
+ $(GTK2_LIBS) $(GLADE2_LIBS) -lz -lm -lXext -lXtst -lGL
+pcsx_LDFLAGS = -pthread
+pcsxr_LDFLAGS = -pthread

View file

@ -1,5 +1,5 @@
--- plugins/bladesio1/Makefile.am.orig 2011-01-25 07:30:23.176137395 +0100
+++ plugins/bladesio1/Makefile.am 2011-01-25 16:41:47.451078804 +0100
--- plugins/bladesio1/Makefile.am.orig 2011-06-30 08:51:19.659732652 +0200
+++ plugins/bladesio1/Makefile.am 2011-06-30 08:52:16.694874269 +0200
@@ -1,5 +1,5 @@
-bindir = @libdir@/games/psemu/
-libdir = @libdir@/games/psemu/
@ -14,13 +14,13 @@
AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
- -DDATADIR=\"${datadir}/psemu/\" \
+ -DDATADIR=\"${datadir}/pcsxr/\" \
$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
$(GTK2_CFLAGS) \
-I../../libpcsxcore -I../../include
@@ -16,5 +16,5 @@
cfgBladeSio1_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
cfgBladeSio1_LDADD = $(GTK2_LIBS)
glade_DATA = sio1.glade2
glade_DATA = sio1.ui
-gladedir = $(datadir)/psemu/
+gladedir = $(datadir)/pcsxr
+gladedir = $(datadir)/pcsxr/
EXTRA_DIST = $(glade_DATA)

View file

@ -1,5 +1,5 @@
--- plugins/dfcdrom/Makefile.am.orig 2011-01-26 14:37:30.887292632 +0100
+++ plugins/dfcdrom/Makefile.am 2011-01-26 14:40:33.221965684 +0100
--- plugins/dfcdrom/Makefile.am.orig 2011-06-30 08:55:41.398655616 +0200
+++ plugins/dfcdrom/Makefile.am 2011-06-30 08:57:01.844014733 +0200
@@ -1,5 +1,5 @@
-bindir = @libdir@/games/psemu/
-libdir = @libdir@/games/psemu/
@ -15,7 +15,7 @@
-libDFCdrom_la_LDFLAGS = -module -avoid-version
-libDFCdrom_la_LIBADD = -lpthread
+libDFCdrom_la_LDFLAGS = -module -avoid-version -pthread
+libDFCdrom_la_LIBADD =
+libDFCdrom_la_LIBADD =
if USE_LIBCDIO
libDFCdrom_la_CFLAGS += -DUSE_LIBCDIO=1 $(LIBCDIO_CFLAGS)
@ -25,13 +25,13 @@
AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
- -DDATADIR=\"${datadir}/psemu/\" \
+ -DDATADIR=\"${datadir}/pcsxr/\" \
$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
$(GTK2_CFLAGS) \
-I../../libpcsxcore -I../../include
@@ -31,5 +31,5 @@
cfgDFCdrom_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
cfgDFCdrom_LDADD = $(GTK2_LIBS)
glade_DATA = cdrcfg-0.1df/dfcdrom.glade2
glade_DATA = cdrcfg-0.1df/dfcdrom.ui
-gladedir = $(datadir)/psemu/
+gladedir = $(datadir)/pcsxr
+gladedir = $(datadir)/pcsxr/
EXTRA_DIST = $(glade_DATA)

View file

@ -1,5 +1,5 @@
--- plugins/dfinput/Makefile.am.orig 2011-01-21 18:22:58.498759182 +0100
+++ plugins/dfinput/Makefile.am 2011-01-21 18:23:49.747937779 +0100
--- plugins/dfinput/Makefile.am.orig 2011-06-30 08:58:33.770048349 +0200
+++ plugins/dfinput/Makefile.am 2011-06-30 09:00:09.852609400 +0200
@@ -1,14 +1,14 @@
-bindir = @libdir@/games/psemu/
-libdir = @libdir@/games/psemu/
@ -8,7 +8,7 @@
lib_LTLIBRARIES = libDFInput.la
libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c
libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c util.c util.h
-libDFInput_la_LDFLAGS = -module -avoid-version
-libDFInput_la_LIBADD = -lpthread -lX11 $(SDL_LIBS)
+libDFInput_la_LDFLAGS = -module -avoid-version -pthread

View file

@ -1,5 +1,5 @@
--- plugins/dfsound/Makefile.am.orig 2011-01-21 18:22:58.487759739 +0100
+++ plugins/dfsound/Makefile.am 2011-01-21 18:24:59.271659928 +0100
--- plugins/dfsound/Makefile.am.orig 2011-07-01 09:14:20.495315356 +0200
+++ plugins/dfsound/Makefile.am 2011-07-01 09:13:24.000000000 +0200
@@ -1,15 +1,15 @@
AM_CPPFLAGS = -I../../include
@ -10,7 +10,7 @@
lib_LTLIBRARIES = libDFSound.la
libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c registers.c
libDFSound_la_SOURCES = adsr.c adsr.h spu.c spu.h cfg.c cfg.h dma.c dma.h gauss_i.h freeze.c reverb.c reverb.h registers.c registers.h externals.c externals.h dsoundoss.h psemuxa.h regs.h xa.c xa.h stdafx.h
libDFSound_la_CPPFLAGS = $(AM_CPPFLAGS)
-libDFSound_la_LDFLAGS = -module -avoid-version
@ -20,17 +20,17 @@
if SOUND_ALSA
libDFSound_la_SOURCES += alsa.c
@@ -41,11 +41,11 @@
@@ -47,11 +47,11 @@
bin_PROGRAMS = cfgDFSound
cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
- -DDATADIR=\"${datadir}/psemu/\" \
+ -DDATADIR=\"${datadir}/pcsxr/\" \
$(GTK2_CFLAGS) $(GLADE2_CFLAGS) $(AM_CPPFLAGS)
$(GTK2_CFLAGS) $(AM_CPPFLAGS)
cfgDFSound_SOURCES = spucfg-0.1df/main.c
cfgDFSound_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
cfgDFSound_LDADD = $(GTK2_LIBS)
glade_DATA = spucfg-0.1df/dfsound.glade2
glade_DATA = spucfg-0.1df/dfsound.ui
-gladedir = $(datadir)/psemu/
+gladedir = $(datadir)/pcsxr/
EXTRA_DIST = $(glade_DATA)

View file

@ -1,12 +1,12 @@
--- plugins/dfxvideo/Makefile.am.orig 2011-01-21 18:16:02.202890852 +0100
+++ plugins/dfxvideo/Makefile.am 2011-01-21 18:17:12.618830029 +0100
--- plugins/dfxvideo/Makefile.am.orig 2011-06-30 09:12:42.916385383 +0200
+++ plugins/dfxvideo/Makefile.am 2011-06-30 09:14:44.735162351 +0200
@@ -7,13 +7,13 @@
$(STRIP_FPIC) $(NASM) -f elf -d ELF -I${srcdir}/ $<
AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
- -DDATADIR=\"${datadir}/psemu/\" \
+ -DDATADIR=\"${datadir}/pcsxr/\" \
$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
$(GTK2_CFLAGS)\
-I../../libpcsxcore \
-I../../include
@ -18,9 +18,9 @@
lib_LTLIBRARIES = libDFXVideo.la
@@ -30,5 +30,5 @@
cfgDFXVideo_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) -lXext
cfgDFXVideo_LDADD = $(GTK2_LIBS) -lXext
glade_DATA = gpucfg-0.1df/dfxvideo.glade2
glade_DATA = gpucfg-0.1df/dfxvideo.ui
-gladedir = $(datadir)/psemu/
+gladedir = $(datadir)/pcsxr/
EXTRA_DIST = $(glade_DATA)

View file

@ -1,26 +1,38 @@
bin/pcsx
%%NLS%%share/locale/fr_FR/LC_MESSAGES/pcsx.mo
%%NLS%%share/locale/it/LC_MESSAGES/pcsx.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/pcsx.mo
%%NLS%%share/locale/ru_RU/LC_MESSAGES/pcsx.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/pcsx.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/pcsx.mo
bin/pcsxr
%%NLS%%share/locale/fr_FR/LC_MESSAGES/pcsxr.mo
%%NLS%%share/locale/it/LC_MESSAGES/pcsxr.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/pcsxr.mo
%%NLS%%share/locale/ru_RU/LC_MESSAGES/pcsxr.mo
%%NLS%%share/locale/hu_HU/LC_MESSAGES/pcsxr.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/pcsxr.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/pcsxr.mo
%%NLS%%@dirrmtry share/locale/hu_HU/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/hu_HU
%%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ru_RU
share/pcsxr/dfcdrom.glade2
share/pcsxr/dfbinimage.glade2
share/pcsxr/dfsound.glade2
share/pcsxr/dfxvideo.glade2
share/pcsxr/gxvideo.glade
share/pcsxr/sio1.glade2
share/pcsxr/peopsxgl.ui
share/pcsxr/dfinput.ui
share/pcsxr/dfnet.ui
share/pcsxr/pcsx.glade2
share/pcsxr/pcsx.jpg
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/cd.png
share/pcsxr/iso-reopen.png
share/pcsxr/cdr.png
share/pcsxr/pcsxr.glade2
share/pcsxr/iso-open.png
share/pcsxr/play.png
share/pcsxr/pad.png
share/pcsxr/memcard.png
share/pcsxr/pcsxr.png
@dirrm share/pcsxr
share/pixmaps/pcsx-icon.png
share/applications/pcsx.desktop
share/pixmaps/pcsxr-icon.png
share/applications/pcsxr.desktop
@dirrmtry share/applications
lib/pcsxr/cfgDFXVideo
lib/pcsxr/cfgpeopsxgl