FreeBSD Bugzilla – Attachment 144590 Details for
Bug 191819
[stage] emulators/pearpc: Update to version 0.5
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
emulators_pearpc.diff
emulators_pearpc.diff (text/plain), 10.27 KB, created by
tkato432
on 2014-07-11 18:44:36 UTC
(
hide
)
Description:
emulators_pearpc.diff
Filename:
MIME Type:
Creator:
tkato432
Created:
2014-07-11 18:44:36 UTC
Size:
10.27 KB
patch
obsolete
>diff -urN /usr/ports/emulators/pearpc/Makefile emulators/pearpc/Makefile >--- /usr/ports/emulators/pearpc/Makefile 2014-07-03 06:37:09.000000000 +0900 >+++ emulators/pearpc/Makefile 2014-07-12 00:00:00.000000000 +0900 >@@ -2,8 +2,7 @@ > # $FreeBSD: head/emulators/pearpc/Makefile 360256 2014-07-02 20:22:55Z antoine $ > > PORTNAME= pearpc >-PORTVERSION= 0.4 >-PORTREVISION= 5 >+PORTVERSION= 0.5 > CATEGORIES= emulators > MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}.0 > >@@ -12,61 +11,50 @@ > > LICENSE= GPLv2 > >-GNU_CONFIGURE= yes >+USES= tar:bzip2 > USE_XORG= x11 >-MAN1= ppc.1 >-SUB_FILES= pkg-message >- >-PLIST_FILES= bin/ppc etc/ppccfg.example %%DATADIR%%/video.x >-PLIST_DIRS= %%DATADIR%% >- >-OPTIONS_DEFINE= SDL OPTIMIZED_CFLAGS DEBUG >-SDL_DESC= Use SDL for user interface >+GNU_CONFIGURE= yes > >-NO_STAGE= yes >-.include <bsd.port.pre.mk> >+BROKEN_ia64= Internal compiler error on ia64 > >-.if ${ARCH} == "ia64" >-BROKEN= Internal compiler error on ia64 >-.endif >+PORTEXAMPLES= ppccfg.example >+PLIST_FILES= bin/ppc man/man1/ppc.1.gz %%DATADIR%%/video.x >+PLIST_DIRS= %%DATADIR%% > >-.if ${PORT_OPTIONS:MSDL} >-CONFIGURE_ARGS+= --enable-ui=sdl >-USE_SDL= sdl >-.else >-CONFIGURE_ARGS+= --enable-ui=x11 >-.endif >+OPTIONS_DEFINE= DEBUG EXAMPLES OPTIMIZED_CFLAGS SDL > >-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} >-CFLAGS+= -O3 -ffast-math >-.else >-CONFIGURE_ARGS+= --disable-fpo >-.endif >+DEBUG_CONFIGURE_ENABLE= debug >+OPTIMIZED_CFLAGS_CFLAGS= -O3 -ffast-math >+OPTIMIZED_CFLAGS_CONFIGURE_ENABLE= fpo >+SDL_USE= sdl=sdl >+SDL_CONFIGURE_ON= --enable-ui=sdl >+SDL_CONFIGURE_OFF= --enable-ui=x11 > >-.if ${PORT_OPTIONS:MDEBUG} >-CONFIGURE_ARGS+= --enable-profiling # implies --enable-debug >-.endif >+.include <bsd.port.options.mk> > >-.if ${ARCH} == "i386" >-BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm >-CONFIGURE_ARGS+= --enable-cpu=jitc_x86 >+.if ${ARCH} == "amd64" || ${ARCH} == "i386" >+USE_GCC= yes > .else > CONFIGURE_ARGS+= --enable-cpu=generic > .endif > >-post-extract: >- @${REINPLACE_CMD} -e 's|-g -O2||;s|-O2||' ${WRKSRC}/configure >- @${REINPLACE_CMD} -e 's|PROCESS_CPUTIME|THREAD_CPUTIME|' \ >+post-patch: >+ @${REINPLACE_CMD} -e \ >+ 's|-O3|| ; \ >+ s|^\(x86_64\)|amd64\* \| \1| ; \ >+ s|-g -O2||' ${WRKSRC}/configure >+ @${REINPLACE_CMD} -e \ >+ 's|video\.x"|${DATADIR}/&|' ${WRKSRC}/ppccfg.example >+ @${REINPLACE_CMD} -e \ >+ 's|PROCESS_CPUTIME|THREAD_CPUTIME|' \ > ${WRKSRC}/src/system/osapi/posix/systimer.cc >- @${REINPLACE_CMD} -e 's|video\.x"|${DATADIR}/&|' \ >- ${WRKSRC}/ppccfg.example > > post-install: >- @${MKDIR} ${DATADIR} >- ${INSTALL_DATA} ${WRKSRC}/video.x ${DATADIR} >- ${INSTALL_DATA} ${WRKSRC}/ppccfg.example ${PREFIX}/etc >- @${ECHO_CMD} >- @${CAT} ${PKGMESSAGE} >- @${ECHO_CMD} >+ @${MKDIR} ${STAGEDIR}${DATADIR} >+ (cd ${WRKSRC} && ${INSTALL_DATA} video.x \ >+ ${STAGEDIR}${DATADIR}) >+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} >+ (cd ${WRKSRC} && ${INSTALL_DATA} ppccfg.example \ >+ ${STAGEDIR}${EXAMPLESDIR}) > >-.include <bsd.port.post.mk> >+.include <bsd.port.mk> >diff -urN /usr/ports/emulators/pearpc/distinfo emulators/pearpc/distinfo >--- /usr/ports/emulators/pearpc/distinfo 2014-06-21 17:48:05.000000000 +0900 >+++ emulators/pearpc/distinfo 2014-07-12 00:00:00.000000000 +0900 >@@ -1,2 +1,2 @@ >-SHA256 (pearpc-0.4.tar.gz) = cf9501dc95b418dc9632e57c75d59e78ec5204db0ed6b41abced2cea30021cce >-SIZE (pearpc-0.4.tar.gz) = 910621 >+SHA256 (pearpc-0.5.tar.bz2) = 4b5ac6b111ba55640c2b2d1de9c4f68cb211aadc472474a564ad9ce6a645fbd3 >+SIZE (pearpc-0.5.tar.bz2) = 800380 >diff -urN /usr/ports/emulators/pearpc/files/mbrtowc.c emulators/pearpc/files/mbrtowc.c >--- /usr/ports/emulators/pearpc/files/mbrtowc.c 2014-06-21 17:48:05.000000000 +0900 >+++ emulators/pearpc/files/mbrtowc.c 1970-01-01 09:00:00.000000000 +0900 >@@ -1,79 +0,0 @@ >-/*- >- * Copyright (c) 2002, 2003 Tim J. Robbins. >- * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution. >- * >- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND >- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE >- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL >- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS >- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) >- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT >- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY >- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF >- * SUCH DAMAGE. >- */ >- >-#include <sys/cdefs.h> >-__FBSDID("$FreeBSD: head/emulators/pearpc/files/mbrtowc.c 340872 2014-01-24 00:14:07Z mat $"); >- >-#include <errno.h> >-#include <rune.h> >-#include <stdlib.h> >-#include <wchar.h> >- >-/* >- * Emulate the ISO C mbrtowc() function in terms of the deprecated >- * 4.4BSD sgetrune() function. >- */ >-size_t >-mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, >- size_t n, mbstate_t * __restrict ps __unused) >-{ >- const char *e; >- rune_t r; >- >- if (s == NULL) { >- pwc = NULL; >- s = ""; >- n = 1; >- } >- >- if ((r = sgetrune(s, n, &e)) == _INVALID_RUNE) { >- /* >- * The design of sgetrune() doesn't give us any way to tell >- * between incomplete and invalid multibyte sequences. >- */ >- >- if (n >= (size_t)MB_CUR_MAX) { >- /* >- * If we have been supplied with at least MB_CUR_MAX >- * bytes and still cannot find a valid character, the >- * data must be invalid. >- */ >- errno = EILSEQ; >- return ((size_t)-1); >- } >- >- /* >- * .. otherwise, it's an incomplete character or an invalid >- * character we cannot detect yet. >- */ >- return ((size_t)-2); >- } >- >- if (pwc != NULL) >- *pwc = (wchar_t)r; >- >- return (r != 0 ? (size_t)(e - s) : 0); >-} >diff -urN /usr/ports/emulators/pearpc/files/patch-src::io::prom::fs::hfsplus::unicode.c emulators/pearpc/files/patch-src::io::prom::fs::hfsplus::unicode.c >--- /usr/ports/emulators/pearpc/files/patch-src::io::prom::fs::hfsplus::unicode.c 2014-06-21 17:48:05.000000000 +0900 >+++ emulators/pearpc/files/patch-src::io::prom::fs::hfsplus::unicode.c 1970-01-01 09:00:00.000000000 +0900 >@@ -1,19 +0,0 @@ >---- src/io/prom/fs/hfsplus/unicode.c.DIST Thu May 6 10:45:32 2004 >-+++ src/io/prom/fs/hfsplus/unicode.c Tue May 25 10:06:24 2004 >-@@ -28,6 +28,16 @@ >- >- #include "unicode.h" >- >-+#ifdef FREEBSD_MB_SUPPORT >-+size_t mbrtowc __P((wchar_t * __restrict, const char * __restrict, size_t, >-+ mbstate_t * __restrict)); >-+size_t wcrtomb __P((char * __restrict, wchar_t, mbstate_t * __restrict)); >-+ >-+#include "mbrtowc.c" >-+#include "wcrtomb.c" >-+#endif /* FREEBSD_MB_SUPPORT */ >-+ >-+ >- /* convert the asci string astr into a unicode string given by ustr. >- * >- * ToDo: Think about better error handling ? >diff -urN /usr/ports/emulators/pearpc/files/patch-src__cpu__mem.h emulators/pearpc/files/patch-src__cpu__mem.h >--- /usr/ports/emulators/pearpc/files/patch-src__cpu__mem.h 1970-01-01 09:00:00.000000000 +0900 >+++ emulators/pearpc/files/patch-src__cpu__mem.h 2014-07-12 00:00:00.000000000 +0900 >@@ -0,0 +1,11 @@ >+--- src/cpu/mem.h.orig >++++ src/cpu/mem.h >+@@ -23,7 +23,7 @@ >+ >+ #include "system/types.h" >+ >+-bool ppc_init_physical_memory(uint size); >++bool FASTCALL ppc_init_physical_memory(uint size); >+ >+ uint32 ppc_get_memory_size(); >+ >diff -urN /usr/ports/emulators/pearpc/files/pkg-message.in emulators/pearpc/files/pkg-message.in >--- /usr/ports/emulators/pearpc/files/pkg-message.in 2014-06-21 17:48:05.000000000 +0900 >+++ emulators/pearpc/files/pkg-message.in 1970-01-01 09:00:00.000000000 +0900 >@@ -1 +0,0 @@ >-Sample configuration file is installed as %%PREFIX%%/etc/ppccfg.example >diff -urN /usr/ports/emulators/pearpc/files/wcrtomb.c emulators/pearpc/files/wcrtomb.c >--- /usr/ports/emulators/pearpc/files/wcrtomb.c 2014-06-21 17:48:05.000000000 +0900 >+++ emulators/pearpc/files/wcrtomb.c 1970-01-01 09:00:00.000000000 +0900 >@@ -1,57 +0,0 @@ >-/*- >- * Copyright (c) 2002, 2003 Tim J. Robbins. >- * All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution. >- * >- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND >- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE >- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE >- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE >- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL >- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS >- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) >- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT >- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY >- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF >- * SUCH DAMAGE. >- */ >- >-#include <sys/cdefs.h> >-__FBSDID("$FreeBSD: head/emulators/pearpc/files/wcrtomb.c 340872 2014-01-24 00:14:07Z mat $"); >- >-#include <errno.h> >-#include <limits.h> >-#include <rune.h> >-#include <stdlib.h> >-#include <wchar.h> >- >-/* >- * Emulate the ISO C wcrtomb() function in terms of the deprecated >- * 4.4BSD sputrune() function. >- */ >-size_t >-wcrtomb(char * __restrict s, wchar_t wc, >- mbstate_t * __restrict ps __unused) >-{ >- char *e; >- char buf[MB_LEN_MAX]; >- >- if (s == NULL) { >- s = buf; >- wc = L'\0'; >- } >- sputrune(wc, s, MB_CUR_MAX, &e); >- if (e == NULL) { >- errno = EILSEQ; >- return ((size_t)-1); >- } >- return ((size_t)(e - s)); >-}
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 191819
: 144590