Attachment 107137 Details for Bug 147849 – file.shar

file.shar

file.shar (text/plain), 25.78 KB, created by Ganael LAPLANCHE on 2010-06-14 12:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ganael LAPLANCHE

Created: 2010-06-14 12:50:01 UTC

Size: 25.78 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	emulators/pcsxr
>#	emulators/pcsxr/distinfo
>#	emulators/pcsxr/pkg-descr
>#	emulators/pcsxr/Makefile
>#	emulators/pcsxr/files
>#	emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am
>#	emulators/pcsxr/files/patch-plugins-dfbinimage2-Open.cpp
>#	emulators/pcsxr/files/patch-gui-LnxMain.c
>#	emulators/pcsxr/files/patch-plugins-dfbinimage2-FileInterface.cpp
>#	emulators/pcsxr/files/patch-configure.ac
>#	emulators/pcsxr/files/patch-plugins-dfinput-pad.c
>#	emulators/pcsxr/files/patch-data-Makefile.am
>#	emulators/pcsxr/files/patch-plugins-dfbinimage2-Makefile.am
>#	emulators/pcsxr/files/patch-gui-Makefile.am
>#	emulators/pcsxr/files/patch-Makefile.am
>#	emulators/pcsxr/files/patch-pixmaps-Makefile.am
>#	emulators/pcsxr/files/patch-gui-ConfDlg.c
>#	emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am
>#	emulators/pcsxr/files/patch-plugins-dfxvideo-gpu.c
>#	emulators/pcsxr/files/patch-plugins-dfbinimage2-defines.h
>#	emulators/pcsxr/files/patch-plugins-dfbinimage2-TrackParser.cpp
>#	emulators/pcsxr/files/patch-plugins-peopsxgl-gpu.c
>#	emulators/pcsxr/files/patch-plugins-dfinput-Makefile.am
>#	emulators/pcsxr/files/patch-libpcsxcore-socket.c
>#	emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am
>#	emulators/pcsxr/pkg-plist
>#
>echo c - emulators/pcsxr
>mkdir -p emulators/pcsxr > /dev/null 2>&1
>echo x - emulators/pcsxr/distinfo
>sed 's/^X//' >emulators/pcsxr/distinfo << '98866f3c96cf08f5454eab85574706b2'
>XMD5 (pcsxr-1.9.91.tar.bz2) = 7c681092c276f3f4b55f243c7bad5aa8
>XSHA256 (pcsxr-1.9.91.tar.bz2) = 82f685dc2699d8a325f77ddd9bf99c25e6e0d90380cc045c0723d13b971bfa3d
>XSIZE (pcsxr-1.9.91.tar.bz2) = 1220648
>XMD5 (pcsx-df-1.10-plugin-dfbinimage2.tar.bz2) = f8f75e76791e8b68005a1207b222709c
>XSHA256 (pcsx-df-1.10-plugin-dfbinimage2.tar.bz2) = 175b71a0a6aff1defdf4d8f9246fcc259fb72876c7ba0bcf607b1e1228fa5a9f
>XSIZE (pcsx-df-1.10-plugin-dfbinimage2.tar.bz2) = 40654
>98866f3c96cf08f5454eab85574706b2
>echo x - emulators/pcsxr/pkg-descr
>sed 's/^X//' >emulators/pcsxr/pkg-descr << 'b502eeee1ee1bb72ff8600b395a184b2'
>XPcsx-reloaded is a Playstation (PSX) emulator.
>X
>XIt is an improved version of pcsx-df, which is
>Xitself of fork of pcsx.
>X
>XThe FreeBSD port includes the dfbinimage2 plugin,
>Xallowing the use of your favorite backups as .bin
>Ximage files.
>X
>XWWW: http://pcsxr.codeplex.com
>b502eeee1ee1bb72ff8600b395a184b2
>echo x - emulators/pcsxr/Makefile
>sed 's/^X//' >emulators/pcsxr/Makefile << '8219c8070acdf06932a5098210b61089'
>X# New ports collection makefile for:	pcsxr
>X# Date created:		11 June 2010
>X# Whom:			Ganael Laplanche <ganael.laplanche@martymac.com>
>X#
>X# $FreeBSD: $
>X#
>X
>XPORTNAME=	pcsxr
>XPORTVERSION=	1.9.91
>XCATEGORIES=	emulators
>X# Original URLs :
>X# http://download.codeplex.com/Project/Download/FileDownload.aspx?ProjectName=pcsxr&DownloadId=98581&FileTime=129064504645100000&Build=16694
>X# http://sourceforge.net/projects/pcsx-df/files/pcsx-df/1.10/pcsx-df-1.10.tar.gz/download
>XMASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/
>XDISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
>X		pcsx-df-1.10-plugin-dfbinimage2${EXTRACT_SUFX}
>XEXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
>X
>XMAINTAINER=	ganael.laplanche@martymac.com
>XCOMMENT=	Playstation (PSX) emulator
>X
>XBUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
>XLIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
>X
>XONLY_FOR_ARCHS=	i386 amd64
>X
>XUSE_BZIP2=	yes
>XUSE_AUTOTOOLS=	autoconf:262:env aclocal:110:env automake:110:env libtool:22
>XUSE_GMAKE=	yes
>XGNU_CONFIGURE=	yes
>XCPPFLAGS+=	-I${LOCALBASE}/include
>XLDFLAGS+=	-L${LOCALBASE}/lib
>XCONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>XCONFIGURE_ARGS=	--enable-opengl
>XUSE_LDCONFIG=	yes
>XUSE_DOS2UNIX=	yes
>X
>XUSE_GNOME=	gtk20 desktopfileutils glib20 libglade2
>XUSE_ICONV=	yes
>XUSE_XORG=	x11 xv xext xxf86vm xtst
>XUSE_SDL=	sdl
>XUSE_GL=	gl
>X
>XMAN1=	pcsx.1
>XPORTDOCS=	ChangeLog README
>X
>X.include <bsd.port.pre.mk>
>X
>X# XXX
>X# dfxvideo plugin seems buggy, remove it in future updates ?
>X
>X.if ${ARCH} == "amd64"
>XCONFIGURE_ARGS+=	--enable-dynarec=x86_64
>X.endif
>X
>X.if !defined(WITHOUT_NLS)
>XUSE_GETTEXT=	yes
>XCONFIGURE_ARGS+=	--enable-nls
>XPLIST_SUB+=	NLS=""
>X.else
>XCONFIGURE_ARGS+=	--disable-nls
>XPLIST_SUB+=	NLS="@comment "
>X.endif
>X
>X# Extract dfbinimage2 plugin
>Xpost-extract:
>X	@(cd ${WRKSRC} && ${TAR} -xjf ${DISTDIR}/pcsx-df-1.10-plugin-dfbinimage2${EXTRACT_SUFX})
>X
>X# Add ${PREFIX} to plugins' lookup directories
>Xpost-patch:
>X	@${SED} -i.bak "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/gui/LnxMain.c
>X
>Xpre-configure:
>X	@(cd ${WRKSRC} && ${AUTORECONF} -fi)
>X
>Xpost-install:
>X.if !defined(NOPORTDOCS)
>X	@${MKDIR} ${DOCSDIR}
>X.for doc in ${PORTDOCS}
>X	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
>X.endfor
>X.endif
>X	@-update-desktop-database
>X
>X.include <bsd.port.post.mk>
>8219c8070acdf06932a5098210b61089
>echo c - emulators/pcsxr/files
>mkdir -p emulators/pcsxr/files > /dev/null 2>&1
>echo x - emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am
>sed 's/^X//' >emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am << 'f745eb4429c23adb5cc698a9d55c2218'
>X--- plugins/peopsxgl/Makefile.am.orig	2010-05-25 06:02:09.577693393 +0000
>X+++ plugins/peopsxgl/Makefile.am	2010-05-25 06:00:10.000000000 +0000
>X@@ -1,11 +1,11 @@
>X INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
>X 	-DLOCALE_DIR=\"${datadir}/locale/\" \
>X-	-DDATADIR=\"${datadir}/psemu/\" \
>X+	-DDATADIR=\"${datadir}/pcsxr/\" \
>X 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
>X 	-I../../libpcsxcore -I../../include -fPIC
>X 
>X-bindir = @libdir@/games/psemu/
>X-libdir = @libdir@/games/psemu/
>X+bindir = @libdir@/pcsxr/
>X+libdir = @libdir@/pcsxr/
>X 
>X lib_LTLIBRARIES = libpeopsxgl.la
>X 
>X@@ -20,5 +20,5 @@
>X cfgpeopsxgl_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
>X 
>X #glade_DATA = gpucfg-0.1df/peopsxgl.glade2
>X-#gladedir = $(datadir)/psemu/
>X+#gladedir = $(datadir)/pcsxr/
>X #EXTRA_DIST = $(glade_DATA)
>f745eb4429c23adb5cc698a9d55c2218
>echo x - emulators/pcsxr/files/patch-plugins-dfbinimage2-Open.cpp
>sed 's/^X//' >emulators/pcsxr/files/patch-plugins-dfbinimage2-Open.cpp << '8311466ade30f39acff7e3f4096b2b31'
>X--- plugins/dfbinimage2/Open.cpp.orig	2010-04-20 06:08:48.510837620 +0000
>X+++ plugins/dfbinimage2/Open.cpp	2010-04-20 06:09:12.454669867 +0000
>X@@ -150,7 +150,7 @@
>X    return theCD->stopTrack();
>X }
>X 
>X-#if defined _WINDOWS || defined __CYGWIN32__
>X+#if defined _WINDOWS || defined __CYGWIN32__ || defined __FreeBSD__
>X 
>X long CALLBACK CDRgetStatus(struct CdrStat *stat) 
>X {
>8311466ade30f39acff7e3f4096b2b31
>echo x - emulators/pcsxr/files/patch-gui-LnxMain.c
>sed 's/^X//' >emulators/pcsxr/files/patch-gui-LnxMain.c << '60bcc5a80165623989c6ed363a162592'
>X--- gui/LnxMain.c.orig	2010-06-01 07:51:28.324517082 +0000
>X+++ gui/LnxMain.c	2010-06-01 08:01:34.204348317 +0000
>X@@ -186,6 +186,9 @@
>X 	gchar *currentdir;
>X 
>X 	// scan some default locations to find plugins
>X+	ScanPlugins("%%PREFIX%%/lib/pcsxr/");
>X+	ScanPlugins("%%PREFIX%%/lib/pcsxr/lib");
>X+	ScanPlugins("%%PREFIX%%/lib/pcsxr/config");
>X 	ScanPlugins("/usr/lib/games/psemu/");
>X 	ScanPlugins("/usr/lib/games/psemu/lib/");
>X 	ScanPlugins("/usr/lib/games/psemu/config/");
>X@@ -211,6 +214,8 @@
>X 	ScanPlugins(DEF_PLUGIN_DIR "/config");
>X 
>X 	// scan some default locations to find bioses
>X+	ScanBios("%%PREFIX%%/lib/pcsxr/");
>X+	ScanBios("%%PREFIX%%/lib/pcsxr/bios");
>X 	ScanBios("/usr/lib/games/psemu");
>X 	ScanBios("/usr/lib/games/psemu/bios");
>X 	ScanBios("/usr/lib64/games/psemu");
>60bcc5a80165623989c6ed363a162592
>echo x - emulators/pcsxr/files/patch-plugins-dfbinimage2-FileInterface.cpp
>sed 's/^X//' >emulators/pcsxr/files/patch-plugins-dfbinimage2-FileInterface.cpp << 'fb93f5f0c8f019a78261914412be7326'
>X--- plugins/dfbinimage2/FileInterface.cpp.orig	2008-08-24 14:27:09.000000000 +0000
>X+++ plugins/dfbinimage2/FileInterface.cpp	2010-04-22 06:01:39.002592019 +0000
>X@@ -35,7 +35,9 @@
>X #include <fcntl.h>
>X #include <sys/stat.h>
>X #include <sys/ioctl.h>
>X-#include <linux/cdrom.h>
>X+#include <sys/cdio.h>
>X+
>X+#define CDROM_LEADOUT  0xAA
>X 
>X extern Preferences prefs;
>X 
>X@@ -462,15 +464,15 @@
>X         THROW(e);
>X     }
>X     fileName = str;
>X-    struct cdrom_tocentry tocEntry;
>X+    struct ioc_read_toc_single_entry tocEntry;
>X     memset(&tocEntry, 0, sizeof(tocEntry));
>X-    tocEntry.cdte_track = CDROM_LEADOUT;
>X-    tocEntry.cdte_format = CDROM_LBA;
>X-    if(ioctl(theFd, CDROMREADTOCENTRY, &tocEntry) < 0) {
>X+    tocEntry.track = CDROM_LEADOUT;
>X+    tocEntry.address_format = CD_LBA_FORMAT;
>X+    if(ioctl(theFd, CDIOREADTOCENTRY, &tocEntry) < 0) {
>X         Exception e(std::string("Cannot read TOC: ") + str);
>X         THROW(e);
>X     }
>X-    CDLength = CDTime(tocEntry.cdte_addr.lba, CDTime::abFrame) + CDTime(0,2,0);
>X+    CDLength = CDTime(tocEntry.entry.addr.lba, CDTime::abFrame) + CDTime(0,2,0);
>X     bufferPos.setMSF(MSFTime(255,255,255));
>X }
>X 
>X@@ -482,9 +484,16 @@
>X     char *buf = (char*)fileBuffer;
>X     int cnt;
>X     for(cnt = 0; cnt < bufferFrames; cnt++) {
>X-        memcpy(buf, seekTime.getMSFbuf(), 3);
>X-        if(ioctl(theFd, CDROMREADRAW, buf)<0)
>X-            break;
>X+        if (lseek(theFd,
>X+                  seekTime.getMSF().m() * bytesPerMinute +
>X+                  seekTime.getMSF().s() * bytesPerSecond +
>X+                  seekTime.getMSF().f() * bytesPerFrame,
>X+                  SEEK_SET) == -1) {
>X+          return;
>X+        }
>X+        if (read(theFd, buf, bytesPerFrame) == -1) {
>X+          return;
>X+        }
>X         buf += bytesPerFrame;
>X         seekTime += CDTime(0,0,1);
>X     }
>fb93f5f0c8f019a78261914412be7326
>echo x - emulators/pcsxr/files/patch-configure.ac
>sed 's/^X//' >emulators/pcsxr/files/patch-configure.ac << '608503b4b7be4b6072502ac43b77743e'
>X--- configure.ac.orig	2009-12-25 18:27:52.000000000 +0000
>X+++ configure.ac	2010-06-08 06:01:19.057047473 +0000
>X@@ -8,6 +8,7 @@
>X AC_CONFIG_HEADERS([include/config.h:include/config.h.in])
>X 
>X AC_PROG_CC
>X+AC_PROG_CXX
>X AC_PROG_RANLIB
>X AC_DISABLE_STATIC
>X AC_PROG_LIBTOOL
>X@@ -34,7 +35,7 @@
>X AC_SUBST(GLADE2_CFLAGS)
>X AC_SUBST(GLADE2_LIBS)
>X 
>X-AC_CONFIG_FILES([Makefile data/Makefile doc/Makefile libpcsxcore/Makefile gui/Makefile plugins/dfinput/Makefile plugins/dfsound/Makefile plugins/dfxvideo/Makefile plugins/dfcdrom/Makefile pixmaps/Makefile po/Makefile.in])
>X+AC_CONFIG_FILES([Makefile data/Makefile doc/Makefile libpcsxcore/Makefile gui/Makefile plugins/dfinput/Makefile plugins/dfsound/Makefile plugins/dfxvideo/Makefile plugins/dfbinimage2/Makefile pixmaps/Makefile po/Makefile.in])
>X 
>X dnl Check for -fno-dse option support
>X saved_CFLAGS="$CFLAGS"
>608503b4b7be4b6072502ac43b77743e
>echo x - emulators/pcsxr/files/patch-plugins-dfinput-pad.c
>sed 's/^X//' >emulators/pcsxr/files/patch-plugins-dfinput-pad.c << '729eb7235140d72469dcf7063f97e320'
>X--- plugins/dfinput/pad.c.orig	2009-12-25 18:26:35.000000000 +0000
>X+++ plugins/dfinput/pad.c	2010-06-03 08:06:29.658820184 +0000
>X@@ -386,3 +386,6 @@
>X long PADtest(void) {
>X 	return PSE_PAD_ERR_SUCCESS;
>X }
>X+
>X+/* missing symbol : do nothing */
>X+void PADsetSensitive(int sensitive) {}
>729eb7235140d72469dcf7063f97e320
>echo x - emulators/pcsxr/files/patch-data-Makefile.am
>sed 's/^X//' >emulators/pcsxr/files/patch-data-Makefile.am << '4e362deeb432fe3542579f8e301fa828'
>X--- data/Makefile.am.orig	2010-05-26 06:02:22.954270724 +0000
>X+++ data/Makefile.am	2010-05-26 06:02:46.484204835 +0000
>X@@ -1,5 +1,5 @@
>X glade_DATA = pcsx.glade2
>X-gladedir = $(datadir)/pcsx
>X+gladedir = $(datadir)/pcsxr
>X 
>X desktopdir = $(datadir)/applications
>X desktop_DATA = pcsx.desktop
>4e362deeb432fe3542579f8e301fa828
>echo x - emulators/pcsxr/files/patch-plugins-dfbinimage2-Makefile.am
>sed 's/^X//' >emulators/pcsxr/files/patch-plugins-dfbinimage2-Makefile.am << '0e1cadd8b00204b303592a3cfc6075d2'
>X--- plugins/dfbinimage2/Makefile.am.orig	2009-03-29 02:25:30.000000000 +0000
>X+++ plugins/dfbinimage2/Makefile.am	2010-05-21 17:20:40.227057628 +0000
>X@@ -1,17 +1,18 @@
>X-INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
>X+INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsxr/\" \
>X 	-DPIXMAPDIR=\"${datadir}/pixmaps/\" \
>X 	-DLOCALE_DIR=\"${datadir}/locale/\" \
>X 	-D__LINUX__ \
>X 	-DREVISION=3 \
>X 	-DBUILD=0 \
>X-	-DDATADIR=\"${datadir}/psemu/\" \
>X+	-DDATADIR=\"${datadir}/pcsxr/\" \
>X 	`pkg-config --cflags sdl vorbisfile libglade-2.0 gtk+-2.0`
>X 
>X-libdir = $(prefix)/lib/games/psemu/
>X+libdir = @libdir@/pcsxr/
>X lib_LTLIBRARIES = libDFBinImage2.la
>X-libDFBinImage2_la_LIBADD  = -lstdc++ -lz -lbz2 -lpthread -lvorbis
>X+libDFBinImage2_la_LIBADD  = -lstdc++ -lz -lbz2 -lvorbis
>X libDFBinImage2_la_LDFLAGS = -module -avoid-version \
>X-	`pkg-config --libs sdl vorbisfile libglade-2.0 gtk+-2.0`
>X+	`pkg-config --libs sdl vorbisfile libglade-2.0 gtk+-2.0` \
>X+	-pthread
>X libDFBinImage2_la_SOURCES = About.cpp PlayCDDAData.cpp \
>X 	CDDAData.hpp ConfigCallbacks.cpp ConfigCallbacks.hpp \
>X 	ConfigFunctions.cpp TrackParser.cpp TrackParser.hpp \
>X@@ -23,7 +24,7 @@
>X 	defines.h externs.h
>X 
>X glade_DATA = dfbinimage.glade2
>X-gladedir = $(datadir)/psemu/
>X+gladedir = $(datadir)/pcsxr/
>X EXTRA_DIST = $(glade_DATA) CDInterface.hpp CDTime.hpp Exception.hpp \
>X 	Frame.hpp TimeCache.hpp TrackInfo.hpp \
>X 	OGG_README.txt notes.txt
>0e1cadd8b00204b303592a3cfc6075d2
>echo x - emulators/pcsxr/files/patch-gui-Makefile.am
>sed 's/^X//' >emulators/pcsxr/files/patch-gui-Makefile.am << 'f9be3de6afa2c5694cefeb4a2124b9d2'
>X--- gui/Makefile.am.orig	2009-12-25 18:25:24.000000000 +0000
>X+++ gui/Makefile.am	2010-06-11 08:23:55.837551420 +0000
>X@@ -1,10 +1,10 @@
>X-INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
>X+INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsxr/\" \
>X 	-DPIXMAPDIR=\"${datadir}/pixmaps/\" \
>X 	-DLOCALE_DIR=\"${datadir}/locale/\" \
>X 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
>X 	-I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \
>X-	-DPSEMU_DATA_DIR=\"${datadir}/psemu\" \
>X-	-DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\"
>X+	-DPSEMU_DATA_DIR=\"${datadir}/pcsxr\" \
>X+	-DDEF_PLUGIN_DIR=\"${libdir}/pcsxr\"
>X 
>X bin_PROGRAMS = pcsx
>X 
>X@@ -18,5 +18,6 @@
>X 	Cheat.c
>X 
>X pcsx_LDADD = \
>X-	$(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst \
>X+	$(GTK2_LIBS) $(GLADE2_LIBS) -lz -lm -lXext -lXtst -lGL \
>X 	../libpcsxcore/libpcsxcore.a
>X+pcsx_LDFLAGS = -pthread
>f9be3de6afa2c5694cefeb4a2124b9d2
>echo x - emulators/pcsxr/files/patch-Makefile.am
>sed 's/^X//' >emulators/pcsxr/files/patch-Makefile.am << 'e7cafef01bb55d52f1630007d21f82d1'
>X--- Makefile.am.orig	2010-05-20 17:39:27.936729388 +0000
>X+++ Makefile.am	2010-05-20 17:40:11.929625133 +0000
>X@@ -1,4 +1,4 @@
>X-SUBDIRS = data doc po libpcsxcore gui pixmaps plugins/dfinput plugins/dfsound plugins/dfxvideo plugins/dfcdrom
>X+SUBDIRS = data doc po libpcsxcore gui pixmaps plugins/dfinput plugins/dfsound plugins/dfxvideo plugins/dfbinimage2
>X SUBDIRS += $(PEOPSXGL)
>X 
>X EXTRA_DIST = AUTHORS COPYING INSTALL NEWS README ChangeLog ChangeLog.df
>e7cafef01bb55d52f1630007d21f82d1
>echo x - emulators/pcsxr/files/patch-pixmaps-Makefile.am
>sed 's/^X//' >emulators/pcsxr/files/patch-pixmaps-Makefile.am << 'b25919cf3067e283d0b4e4ddd21ef803'
>X--- pixmaps/Makefile.am.orig	2010-05-26 05:59:40.935976220 +0000
>X+++ pixmaps/Makefile.am	2010-05-26 05:59:52.223938796 +0000
>X@@ -1,4 +1,4 @@
>X-pixmapdir = "$(datadir)/pcsx"
>X+pixmapdir = "$(datadir)/pcsxr"
>X pixmap_DATA = pcsx.jpg
>X 
>X icondir = "$(datadir)/pixmaps"
>b25919cf3067e283d0b4e4ddd21ef803
>echo x - emulators/pcsxr/files/patch-gui-ConfDlg.c
>sed 's/^X//' >emulators/pcsxr/files/patch-gui-ConfDlg.c << '4365b22d1cf4f74a3e28a2dc2b8d7709'
>X--- gui/ConfDlg.c.orig	2010-06-03 07:59:39.428023393 +0000
>X+++ gui/ConfDlg.c	2010-06-03 08:01:49.836121070 +0000
>X@@ -632,7 +632,7 @@
>X 		}
>X 
>X 		PSE_getLibType = (PSEgetLibType)dlsym(Handle, "PSEgetLibType");
>X-		if (dlerror() != NULL) {
>X+		if (PSE_getLibType == NULL) {
>X 			if (strstr(linkname, "gpu") != NULL) type = PSE_LT_GPU;
>X 			else if (strstr(linkname, "cdr") != NULL) type = PSE_LT_CDR;
>X 			else if (strstr(linkname, "spu") != NULL) type = PSE_LT_SPU;
>X@@ -642,10 +642,10 @@
>X 		else type = PSE_getLibType();
>X 
>X 		PSE_getLibName = (PSEgetLibName) dlsym(Handle, "PSEgetLibName");
>X-		if (dlerror() == NULL) {
>X+		if (PSE_getLibName != NULL) {
>X 			sprintf(name, "%s", PSE_getLibName());
>X 			PSE_getLibVersion = (PSEgetLibVersion) dlsym(Handle, "PSEgetLibVersion");
>X-			if (dlerror() == NULL) {
>X+			if (PSE_getLibVersion != NULL) {
>X 				char ver[32];
>X 
>X 				v = PSE_getLibVersion();
>X@@ -720,17 +720,17 @@
>X 			if (Handle == NULL) continue;
>X 
>X 			PSE_getLibType = (PSEgetLibType) dlsym(Handle, "PSEgetLibType");
>X-			if (dlerror() != NULL) {
>X+			if (PSE_getLibType == NULL) {
>X 				if (strstr(plugin, "net") != NULL) type = PSE_LT_NET;
>X 				else continue;
>X 			}
>X 			else type = PSE_getLibType();
>X 
>X 			PSE_getLibName = (PSEgetLibName) dlsym(Handle, "PSEgetLibName");
>X-			if (dlerror() == NULL) {
>X+			if (PSE_getLibName != NULL) {
>X 				sprintf(name, "%s", PSE_getLibName());
>X 				PSE_getLibVersion = (PSEgetLibVersion) dlsym(Handle, "PSEgetLibVersion");
>X-				if (dlerror() == NULL) {
>X+				if (PSE_getLibVersion != NULL) {
>X 					char ver[32];
>X 
>X 					v = PSE_getLibVersion();
>4365b22d1cf4f74a3e28a2dc2b8d7709
>echo x - emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am
>sed 's/^X//' >emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am << '9d589f28537c2f35296b4a0169ec40c5'
>X--- plugins/dfsound/Makefile.am.orig	2009-12-25 18:26:41.000000000 +0000
>X+++ plugins/dfsound/Makefile.am	2010-05-21 17:21:11.042375497 +0000
>X@@ -1,11 +1,11 @@
>X INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
>X 	-DLOCALE_DIR=\"${datadir}/locale/\" \
>X-	-DDATADIR=\"${datadir}/psemu/\" \
>X+	-DDATADIR=\"${datadir}/pcsxr/\" \
>X 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
>X 	-I../../include
>X 
>X-bindir = @libdir@/games/psemu/
>X-libdir = @libdir@/games/psemu/
>X+bindir = @libdir@/pcsxr/
>X+libdir = @libdir@/pcsxr/
>X 
>X lib_LTLIBRARIES = libDFSound.la
>X 
>X@@ -13,7 +13,7 @@
>X 	alsa.c oss.c nullsnd.c
>X 
>X libDFSound_la_CFLAGS =
>X-libDFSound_la_LDFLAGS = -module -avoid-version -lpthread -lm
>X+libDFSound_la_LDFLAGS = -module -avoid-version -pthread -lm
>X 
>X if HAVE_ALSA
>X libDFSound_la_CFLAGS += -DUSEALSA=1
>X@@ -29,5 +29,5 @@
>X cfgDFSound_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
>X 
>X glade_DATA = spucfg-0.1df/dfsound.glade2
>X-gladedir = $(datadir)/psemu/
>X+gladedir = $(datadir)/pcsxr/
>X EXTRA_DIST = $(glade_DATA)
>9d589f28537c2f35296b4a0169ec40c5
>echo x - emulators/pcsxr/files/patch-plugins-dfxvideo-gpu.c
>sed 's/^X//' >emulators/pcsxr/files/patch-plugins-dfxvideo-gpu.c << 'b97788963b1e18494d1974ef982df03c'
>X--- plugins/dfxvideo/gpu.c.orig	2010-05-20 05:55:08.652920412 +0000
>X+++ plugins/dfxvideo/gpu.c	2010-05-20 05:55:46.907370070 +0000
>X@@ -1930,3 +1930,6 @@
>X }
>X 
>X ////////////////////////////////////////////////////////////////////////
>X+
>X+/* missing symbol : do nothing */
>X+void CALLBACK GPUclearDynarec(void) {}
>b97788963b1e18494d1974ef982df03c
>echo x - emulators/pcsxr/files/patch-plugins-dfbinimage2-defines.h
>sed 's/^X//' >emulators/pcsxr/files/patch-plugins-dfbinimage2-defines.h << 'c7e80be8ccfd41e13cc0e6960fd5b665'
>X--- plugins/dfbinimage2/defines.h.orig	2010-04-20 06:30:12.862325658 +0000
>X+++ plugins/dfbinimage2/defines.h	2010-04-20 06:30:50.977164904 +0000
>X@@ -126,7 +126,9 @@
>X     HWND          HWnd;        // Window handle
>X     HINSTANCE     HInstance;
>X } FPSEWin32;
>X+#endif
>X 
>X+#if defined _WINDOWS || defined __CYGWIN32__ || defined __FreeBSD__
>X // cdr stat struct
>X struct CdrStat
>X {
>X@@ -134,7 +136,6 @@
>X  unsigned long Status;
>X  unsigned char Time[3]; // current playing time
>X };
>X-
>X #endif
>X 
>X // Main Struct for initialization
>c7e80be8ccfd41e13cc0e6960fd5b665
>echo x - emulators/pcsxr/files/patch-plugins-dfbinimage2-TrackParser.cpp
>sed 's/^X//' >emulators/pcsxr/files/patch-plugins-dfbinimage2-TrackParser.cpp << '49db77a3631899131ca1f8f7be5733ec'
>X--- plugins/dfbinimage2/TrackParser.cpp.orig	2010-04-15 06:30:33.334174874 +0000
>X+++ plugins/dfbinimage2/TrackParser.cpp	2010-04-15 18:38:51.436143280 +0000
>X@@ -30,7 +30,7 @@
>X #include <fcntl.h>
>X #include <sys/stat.h>
>X #include <sys/ioctl.h>
>X-#include <linux/cdrom.h>
>X+#include <sys/cdio.h>
>X 
>X using namespace std;
>X 
>X@@ -282,25 +282,25 @@
>X         Exception e(std::string("Cannot open device: ") + cuename);
>X         THROW(e);
>X     }
>X-    struct cdrom_tochdr tocHdr;
>X-    if(ioctl(theFd, CDROMREADTOCHDR, &tocHdr) < 0) {
>X+    struct ioc_toc_header tocHdr;
>X+    if(ioctl(theFd, CDIOREADTOCENTRY, &tocHdr) < 0) {
>X         close(theFd);
>X         Exception e(std::string("Cannot read TOC: ") + cuename);
>X         THROW(e);
>X     }
>X-    struct cdrom_tocentry tocEntry;
>X-    for(int i = tocHdr.cdth_trk0; i <= tocHdr.cdth_trk1; i++) {
>X+    struct ioc_read_toc_single_entry tocEntry;
>X+    for(int i = tocHdr.starting_track; i <= tocHdr.ending_track; i++) {
>X         memset(&tocEntry, 0, sizeof(tocEntry));
>X-        tocEntry.cdte_track = i;
>X-        tocEntry.cdte_format = CDROM_LBA;
>X-        if(ioctl(theFd, CDROMREADTOCENTRY, &tocEntry) < 0) {
>X+        tocEntry.track = i;
>X+        tocEntry.address_format = CD_LBA_FORMAT;
>X+        if(ioctl(theFd, CDIOREADTOCENTRY, &tocEntry) < 0) {
>X             close(theFd);
>X             Exception e(std::string("Cannot read TOC: ") + cuename);
>X             THROW(e);
>X         }
>X         TrackInfo thisTrack;
>X         thisTrack.trackNumber = i;
>X-        thisTrack.trackStart = CDTime(tocEntry.cdte_addr.lba, CDTime::abFrame);
>X+        thisTrack.trackStart = CDTime(tocEntry.entry.addr.lba, CDTime::abFrame);
>X         tiv.push_back(thisTrack);
>X     }
>X     close(theFd);
>49db77a3631899131ca1f8f7be5733ec
>echo x - emulators/pcsxr/files/patch-plugins-peopsxgl-gpu.c
>sed 's/^X//' >emulators/pcsxr/files/patch-plugins-peopsxgl-gpu.c << '877c162a7a59edf6ac2df44ce07aefa1'
>X--- plugins/peopsxgl/gpu.c.orig	2010-05-20 05:59:22.148962228 +0000
>X+++ plugins/peopsxgl/gpu.c	2010-05-20 06:12:07.650815396 +0000
>X@@ -3194,3 +3194,7 @@
>X {
>X  dwCoreFlags=dwFlags;
>X }
>X+
>X+/* missing symbols : do nothing */
>X+void CALLBACK GPUclearDynarec(void) {}
>X+void CALLBACK GPUdisplayText(char * pText) {}
>877c162a7a59edf6ac2df44ce07aefa1
>echo x - emulators/pcsxr/files/patch-plugins-dfinput-Makefile.am
>sed 's/^X//' >emulators/pcsxr/files/patch-plugins-dfinput-Makefile.am << 'e0795b07d74692de6ac277ff643c00ba'
>X--- plugins/dfinput/Makefile.am.orig	2009-12-25 18:26:35.000000000 +0000
>X+++ plugins/dfinput/Makefile.am	2010-05-21 17:21:03.238298722 +0000
>X@@ -1,15 +1,15 @@
>X-bindir = @libdir@/games/psemu/
>X-libdir = @libdir@/games/psemu/
>X+bindir = @libdir@/pcsxr/
>X+libdir = @libdir@/pcsxr/
>X 
>X lib_LTLIBRARIES = libDFInput.la
>X 
>X libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c
>X-libDFInput_la_LDFLAGS = -module -avoid-version -lpthread -lX11 \
>X+libDFInput_la_LDFLAGS = -module -avoid-version -pthread -lX11 \
>X 	`$(SDL_CONFIG) --libs` -L/usr/X11R6/lib64 -L/usr/X11R6/lib
>X 
>X INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
>X 	-DLOCALE_DIR=\"${datadir}/locale/\" \
>X-	-DDATADIR=\"${datadir}/psemu/\" \
>X+	-DDATADIR=\"${datadir}/pcsxr/\" \
>X 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
>X 	-I../../include -I../../libpcsxcore `$(SDL_CONFIG) --cflags`
>X 
>X@@ -19,5 +19,5 @@
>X cfgDFInput_LDFLAGS = `$(SDL_CONFIG) --libs`
>X 
>X glade_DATA = dfinput.glade2
>X-gladedir = $(datadir)/psemu/
>X+gladedir = $(datadir)/pcsxr/
>X EXTRA_DIST = $(glade_DATA)
>e0795b07d74692de6ac277ff643c00ba
>echo x - emulators/pcsxr/files/patch-libpcsxcore-socket.c
>sed 's/^X//' >emulators/pcsxr/files/patch-libpcsxcore-socket.c << '84f71d741ebe46e51753f69e50179e64'
>X--- libpcsxcore/socket.c.orig	2010-05-19 17:43:40.987010639 +0000
>X+++ libpcsxcore/socket.c	2010-05-19 17:46:42.625194542 +0000
>X@@ -19,9 +19,11 @@
>X #ifdef _WIN32
>X #include <winsock2.h>
>X #else
>X+#include <sys/types.h>
>X #include <sys/socket.h>
>X #include <sys/ioctl.h>
>X #include <arpa/inet.h>
>X+#include <netinet/in.h>
>X #include <unistd.h>
>X #include <fcntl.h>
>X #endif
>84f71d741ebe46e51753f69e50179e64
>echo x - emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am
>sed 's/^X//' >emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am << 'a667d1dea56f20529ef42aac73917f6b'
>X--- plugins/dfxvideo/Makefile.am.orig	2010-05-25 06:01:00.630057102 +0000
>X+++ plugins/dfxvideo/Makefile.am	2010-05-25 05:59:52.000000000 +0000
>X@@ -8,13 +8,13 @@
>X 
>X INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
>X 	-DLOCALE_DIR=\"${datadir}/locale/\" \
>X-	-DDATADIR=\"${datadir}/psemu/\" \
>X+	-DDATADIR=\"${datadir}/pcsxr/\" \
>X 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
>X 	-I../../libpcsxcore \
>X 	-I../../include
>X 
>X-bindir = @libdir@/games/psemu/
>X-libdir = @libdir@/games/psemu/
>X+bindir = @libdir@/pcsxr/
>X+libdir = @libdir@/pcsxr/
>X 
>X lib_LTLIBRARIES = libDFXVideo.la
>X 
>X@@ -32,5 +32,5 @@
>X cfgDFXVideo_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) -L/usr/X11R6/lib -lXext
>X 
>X glade_DATA = gpucfg-0.1df/dfxvideo.glade2
>X-gladedir = $(datadir)/psemu/
>X+gladedir = $(datadir)/pcsxr/
>X EXTRA_DIST = $(glade_DATA)
>a667d1dea56f20529ef42aac73917f6b
>echo x - emulators/pcsxr/pkg-plist
>sed 's/^X//' >emulators/pcsxr/pkg-plist << '228648305eef4f0c3155d52f74692b13'
>Xbin/pcsx
>X%%NLS%%share/locale/pt_BR/LC_MESSAGES/pcsx.mo
>X%%NLS%%share/locale/zh_TW/LC_MESSAGES/pcsx.mo
>X%%NLS%%share/locale/zh_CN/LC_MESSAGES/pcsx.mo
>Xshare/pcsxr/dfbinimage.glade2
>Xshare/pcsxr/dfsound.glade2
>Xshare/pcsxr/dfxvideo.glade2
>Xshare/pcsxr/dfinput.glade2
>Xshare/pcsxr/pcsx.glade2
>Xshare/pcsxr/pcsx.jpg
>X@dirrm share/pcsxr
>Xshare/pixmaps/pcsx-icon.png
>Xshare/applications/pcsx.desktop
>X@dirrmtry share/applications
>Xlib/pcsxr/cfgDFXVideo
>Xlib/pcsxr/cfgpeopsxgl
>Xlib/pcsxr/cfgDFInput
>Xlib/pcsxr/cfgDFSound
>Xlib/pcsxr/libDFXVideo.a
>Xlib/pcsxr/libDFXVideo.la
>Xlib/pcsxr/libDFXVideo.so
>Xlib/pcsxr/libpeopsxgl.a
>Xlib/pcsxr/libpeopsxgl.la
>Xlib/pcsxr/libpeopsxgl.so
>Xlib/pcsxr/libDFInput.a
>Xlib/pcsxr/libDFInput.la
>Xlib/pcsxr/libDFInput.so
>Xlib/pcsxr/libDFSound.a
>Xlib/pcsxr/libDFSound.la
>Xlib/pcsxr/libDFSound.so
>Xlib/pcsxr/libDFBinImage2.a
>Xlib/pcsxr/libDFBinImage2.la
>Xlib/pcsxr/libDFBinImage2.so
>X@dirrm lib/pcsxr
>X@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
>X@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
>228648305eef4f0c3155d52f74692b13
>exit

Actions: View

Attachments on bug 147849: 107137