From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 14 18:50:32 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ACEC11065675 for ; Fri, 14 Oct 2011 18:50:32 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 88B468FC19 for ; Fri, 14 Oct 2011 18:50:32 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p9EIoW8P052604 for ; Fri, 14 Oct 2011 18:50:32 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p9EIoWi7052601; Fri, 14 Oct 2011 18:50:32 GMT (envelope-from gnats) Resent-Date: Fri, 14 Oct 2011 18:50:32 GMT Resent-Message-Id: <201110141850.p9EIoWi7052601@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33F5F10656B4 for ; Fri, 14 Oct 2011 18:44:25 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa106lp.auone-net.jp (msa106lp.auone-net.jp [222.3.140.169]) by mx1.freebsd.org (Postfix) with ESMTP id CCD948FC26 for ; Fri, 14 Oct 2011 18:44:24 +0000 (UTC) Received: from msa106lp.auone-net.jp (MSA106lp [172.27.12.184]) by msa106lp.auone-net.jp (au one net msa) with ESMTP id E7B5B500264 for ; Sat, 15 Oct 2011 03:32:53 +0900 (JST) Received: from localhost.localdomain (ZT046175.ppp.dion.ne.jp [59.128.46.175]) by msa106lp.auone-net.jp (au one net msa) with ESMTP id 292B523C031 for ; Sat, 15 Oct 2011 03:32:49 +0900 (JST) Message-Id: <20111015025749.57181f78.tkato432@yahoo.com> Date: Sat, 15 Oct 2011 02:57:49 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/161649: Update port: emulators/osmose to 0.9.96 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Oct 2011 18:50:32 -0000 >Number: 161649 >Category: ports >Synopsis: Update port: emulators/osmose to 0.9.96 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Oct 14 18:50:32 UTC 2011 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p3 i386 >Organization: >Environment: >Description: - Update to version 0.9.96 Remove file: files/patch-Makefile files/patch-PrecisionTimer.h files/patch-TvVideoFilter.h files/patch-unzip-Makefile files/patch-zlib-Makefile >How-To-Repeat: >Fix: diff -urN /usr/ports/emulators/osmose/Makefile emulators/osmose/Makefile --- /usr/ports/emulators/osmose/Makefile 2011-02-27 16:37:35.000000000 +0900 +++ emulators/osmose/Makefile 2011-09-17 05:17:57.000000000 +0900 @@ -6,42 +6,41 @@ # PORTNAME= osmose -PORTVERSION= 0.6.30 -PORTREVISION= 3 +PORTVERSION= 0.9.96 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= pav -DISTNAME= ${PORTNAME}-final-src +MASTER_SITES= http://bcz.asterope.fr/osmose/ +DISTNAME= Osmose-${PORTVERSION:S/./-/g}-QT MAINTAINER= ports@FreeBSD.org COMMENT= Sega Master System emulator -BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm +LICENSE= GPLv3 # (or later) +LICENSE_FILE= ${WRKSRC}/License.txt -ONLY_FOR_ARCHS= i386 -ONLY_FOR_ARCHS_REASON= uses i386 assembly code -USE_DOS2UNIX= yes -USE_ZIP= yes -USE_GMAKE= yes -USE_SDL= sdl -NO_WRKSUBDIR= yes +BUILD_DEPENDS= ${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js +LIB_DEPENDS= asound.2:${PORTSDIR}/audio/alsa-lib +RUN_DEPENDS= ${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js -OPTIONS= OPTIMIZED_CFLAGS "Enable compilation optimizations" on +USE_ZIP= yes +USE_QT_VER= 4 +QT_COMPONENTS= corelib gui opengl moc_build qmake_build uic_build +QMAKEFLAGS+= TARGET=release -PLIST_FILES= bin/osmose -PORTDOCS= readme.txt +PORTDOCS= Readme.txt TODO.txt +PLIST_FILES= bin/${PORTNAME} .include -.if !defined(WITHOUT_OPTIMIZED_CFLAGS) -MAKE_ENV+= OPTIMIZED_CFLAGS=yes -.endif +do-configure: + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS}) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin/${PORTNAME} .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR} + @${MKDIR} ${DOCSDIR} +.for doc in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} +.endfor .endif .include diff -urN /usr/ports/emulators/osmose/distinfo emulators/osmose/distinfo --- /usr/ports/emulators/osmose/distinfo 2011-07-03 02:42:14.000000000 +0900 +++ emulators/osmose/distinfo 2011-09-15 18:43:54.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (osmose-final-src.zip) = 1e0b0efe772fe10a3648e6878e7e495c8b9466fab1f8bf6864e80b7fb9b6d112 -SIZE (osmose-final-src.zip) = 297235 +SHA256 (Osmose-0-9-96-QT.zip) = aca1d1b6b01d1e0efefd7e42eca9bc332d043869a934863321d3925267ca8d79 +SIZE (Osmose-0-9-96-QT.zip) = 194671 diff -urN /usr/ports/emulators/osmose/files/patch-Makefile emulators/osmose/files/patch-Makefile --- /usr/ports/emulators/osmose/files/patch-Makefile 2007-04-08 13:01:43.000000000 +0900 +++ emulators/osmose/files/patch-Makefile 1970-01-01 09:00:00.000000000 +0900 @@ -1,54 +0,0 @@ ---- Makefile.orig Sat Apr 7 20:42:59 2007 -+++ Makefile Sat Apr 7 20:44:04 2007 -@@ -43,21 +43,25 @@ - - # Compiler/Linker Flags - # add -O3 to CFLAGS for speedup -pg on LFLAGS and CFLAGS for gprof --CFLAGS = -Wall -O3 --LFLAGS = -lSDL -+CFLAGS += -Dlinux `sdl-config --cflags` -+ -+ifdef OPTIMIZED_CFLAGS -+CFLAGS += -O3 -+endif -+ -+LFLAGS = $(LDFLAGS) `sdl-config --libs` - AFLAGS = -f elf --CC = g++ --C_COMP = gcc -+CXX ?= g++ - ASM = nasm - - # Our needed rules. $* is current file, without suffix. - .SUFFIXES: .cxx .o - .cxx.o: -- $(CC) $(CFLAGS) -c $*.cxx -o $*.o -+ $(CXX) $(CFLAGS) -c $*.cxx -o $*.o - - .SUFFIXES: .cpp .o - .cpp.o: -- $(CC) $(CFLAGS) -c $*.cpp -o $*.o -+ $(CXX) $(CFLAGS) -c $*.cpp -o $*.o - - .SUFFIXES: .asm .o - .asm.o: -@@ -66,7 +70,7 @@ - all: disasm z80_lib libs osmose - - osmose: $(z80_lib) $(OSM_OBJS) $(OPT_OBJS) -- $(CC) $(CFLAGS) $(OSM_OBJS) $(Z80_LIB) $(OPT_OBJS) $(UNZIP_LIB) $(Z_LIB) -o $(OSM_EXE) $(LFLAGS) -+ $(CXX) $(CFLAGS) $(OSM_OBJS) $(Z80_LIB) $(OPT_OBJS) $(UNZIP_LIB) $(Z_LIB) -o $(OSM_EXE) $(LFLAGS) - - z80_lib: $(Z80_OBJS) - ar -rv $(Z80_LIB) $(Z80_DIR)/*.o -@@ -84,8 +88,8 @@ - rm -f *.o core $(OSM_EXE) - - libs: -- cd $(Z_LIB_DIR) && make libz.a -- cd $(UNZIP_DIR) && make unzip.a -+ cd $(Z_LIB_DIR) && ${MAKE} libz.a -+ cd $(UNZIP_DIR) && ${MAKE} unzip.a - - - diff -urN /usr/ports/emulators/osmose/files/patch-PrecisionTimer.h emulators/osmose/files/patch-PrecisionTimer.h --- /usr/ports/emulators/osmose/files/patch-PrecisionTimer.h 2007-04-08 12:11:22.000000000 +0900 +++ emulators/osmose/files/patch-PrecisionTimer.h 1970-01-01 09:00:00.000000000 +0900 @@ -1,10 +0,0 @@ ---- ./PrecisionTimer.h.orig Sat Apr 7 19:48:42 2007 -+++ ./PrecisionTimer.h Sat Apr 7 19:49:31 2007 -@@ -81,6 +81,6 @@ - unsigned long long tick_per_second; // Self explanatory. - unsigned long long T0; // Self explanatory. - unsigned long long T1; // Self explanatory. -- double PrecisionTimer::getOneShotDuration(); -+ double getOneShotDuration(); - }; - #endif diff -urN /usr/ports/emulators/osmose/files/patch-TvVideoFilter.h emulators/osmose/files/patch-TvVideoFilter.h --- /usr/ports/emulators/osmose/files/patch-TvVideoFilter.h 2007-04-08 12:11:22.000000000 +0900 +++ emulators/osmose/files/patch-TvVideoFilter.h 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- ./TvVideoFilter.h.orig Sat Apr 7 19:48:42 2007 -+++ ./TvVideoFilter.h Sat Apr 7 19:49:43 2007 -@@ -19,7 +19,7 @@ - - class TvVideoFilter : public VideoFilter { - public: -- TvVideoFilter::TvVideoFilter(); -+ TvVideoFilter(); - int getFinalOutputWidth(); - int getFinalOutputHeight(); - void Filter(SDL_Surface *s, SDL_Surface *d); diff -urN /usr/ports/emulators/osmose/files/patch-unzip-Makefile emulators/osmose/files/patch-unzip-Makefile --- /usr/ports/emulators/osmose/files/patch-unzip-Makefile 2005-07-28 20:14:51.000000000 +0900 +++ emulators/osmose/files/patch-unzip-Makefile 1970-01-01 09:00:00.000000000 +0900 @@ -1,8 +0,0 @@ ---- unzip/Makefile.orig Fri Dec 17 13:21:30 2004 -+++ unzip/Makefile Tue Jul 26 21:15:04 2005 -@@ -1,5 +1,3 @@ --CC=cc --CFLAGS=-O - - UNZ_OBJS = unzip.o ioapi.o - diff -urN /usr/ports/emulators/osmose/files/patch-zlib-Makefile emulators/osmose/files/patch-zlib-Makefile --- /usr/ports/emulators/osmose/files/patch-zlib-Makefile 2005-07-28 20:14:51.000000000 +0900 +++ emulators/osmose/files/patch-zlib-Makefile 1970-01-01 09:00:00.000000000 +0900 @@ -1,12 +0,0 @@ ---- zlib/Makefile.orig Fri Dec 17 11:04:40 2004 -+++ zlib/Makefile Tue Jul 26 21:16:20 2005 -@@ -16,9 +16,7 @@ - # To install in $HOME instead of /usr/local, use: - # make install prefix=$HOME - --CC=cc - --CFLAGS=-O - #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 - #CFLAGS=-g -DDEBUG - #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ diff -urN /usr/ports/emulators/osmose/pkg-descr emulators/osmose/pkg-descr --- /usr/ports/emulators/osmose/pkg-descr 2005-07-28 20:14:51.000000000 +0900 +++ emulators/osmose/pkg-descr 2011-09-15 22:34:33.000000000 +0900 @@ -1,12 +1,9 @@ Osmose is another Sega Master System emulator. The emulator is released as open source project, under GPL license. -The emulator relies on SDL library, zlib, and uses Alessandro Scotti z80 cpu +The emulator relies on Qt library, zlib, and uses Alessandro Scotti z80 cpu core. Alessandro, is the author of the nice multi machine emulator 'Tickle'. Rom decompression relies on Zlib and Gilles Vollant unzip package. Scale2x video Filter is based on Andrea Mazzoleni's algorithm. -WWW: http://bcz.emu-france.com/ - -- Alejandro Pulver -alejandro@varnet.biz +WWW: http://bcz.asterope.fr/osmose.htm >Release-Note: >Audit-Trail: >Unformatted: