From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Aug 7 13:50:19 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1B0F537B40E for ; Thu, 7 Aug 2003 13:50:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE1E943FCB for ; Thu, 7 Aug 2003 13:50:14 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h77KoEUp012968 for ; Thu, 7 Aug 2003 13:50:14 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h77KoEBw012967; Thu, 7 Aug 2003 13:50:14 -0700 (PDT) Resent-Date: Thu, 7 Aug 2003 13:50:14 -0700 (PDT) Resent-Message-Id: <200308072050.h77KoEBw012967@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, Stefan Farfeleder Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E08D37B446 for ; Thu, 7 Aug 2003 13:45:01 -0700 (PDT) Received: from fafoe.narf.at (chello212186121237.14.vie.surfer.at [212.186.121.237]) by mx1.FreeBSD.org (Postfix) with ESMTP id D94E143F85 for ; Thu, 7 Aug 2003 13:44:57 -0700 (PDT) (envelope-from stefan@fafoe.dyndns.org) Received: from frog.fafoe.narf.at (frog.fafoe.narf.at [192.168.2.101]) by fafoe.narf.at (Postfix) with ESMTP id 47C213FA8; Thu, 7 Aug 2003 22:44:55 +0200 (CEST) Received: by frog.fafoe.narf.at (Postfix, from userid 1001) id 2E9B73F4; Thu, 7 Aug 2003 22:44:54 +0200 (CEST) Message-Id: <20030807204454.2E9B73F4@frog.fafoe.narf.at> Date: Thu, 7 Aug 2003 22:44:54 +0200 (CEST) From: Stefan Farfeleder To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: stefan@fafoe.narf.at Subject: ports/55352: Update port: multimedia/slideshow to 0.8.0.p5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Stefan Farfeleder List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Aug 2003 20:50:20 -0000 >Number: 55352 >Category: ports >Synopsis: Update port: multimedia/slideshow to 0.8.0.p5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Aug 07 13:50:14 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Stefan Farfeleder >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD frog.fafoe.narf.at 5.1-CURRENT FreeBSD 5.1-CURRENT #1: Sat Jul 26 17:55:37 CEST 2003 freebsd@frog.fafoe.narf.at:/freebsd/frog/obj/freebsd/frog/src/sys/FROG i386 >Description: The upgrade should fix the build problems with GCC 3.3 and issues with 16 bit colour depth. >How-To-Repeat: >Fix: Removed files: pkg-message files/patch-src::EffectDarkness.cpp files/patch-src::FontVault.h New files (included in the diff): files/patch-configure files/patch-src::Page.cpp --- slideshow.diff begins here --- Index: Makefile =================================================================== RCS file: /usr/home/ncvs/ports/multimedia/slideshow/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 3 Aug 2003 14:44:45 -0000 1.5 +++ Makefile 4 Aug 2003 17:31:03 -0000 @@ -6,7 +6,7 @@ # PORTNAME= slideshow -PORTVERSION= 0.8.0.p4 +PORTVERSION= 0.8.0.p5 CATEGORIES= multimedia MASTER_SITES= http://savannah.nongnu.org/download/${PORTNAME}/${PORTNAME}.pkg/${PORTVERSION:S/.p/-pre/}/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-pre/} @@ -19,8 +19,10 @@ xml2.5:${PORTSDIR}/textproc/libxml2 \ smpeg.1:${PORTSDIR}/multimedia/smpeg +WRKSRC= ${WRKDIR}/${DISTNAME:C/-pre.*//} SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config INSTALLS_SHLIB= yes +USE_GMAKE= yes USE_LIBTOOL= yes USE_PYTHON= yes USE_REINPLACE= yes @@ -62,6 +64,5 @@ post-install: @${STRIP_CMD} ${PREFIX}/lib/libslideshow.so.0 # @${STRIP_CMD} ${PYTHONPREFIX_SITELIBDIR}/_slideshow.so - @${CAT} ${PKGMESSAGE} .include Index: distinfo =================================================================== RCS file: /usr/home/ncvs/ports/multimedia/slideshow/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 8 Jan 2003 20:32:36 -0000 1.1 +++ distinfo 4 Aug 2003 17:31:03 -0000 @@ -1 +1 @@ -MD5 (slideshow-0.8.0-pre4.tar.gz) = b17746903b43c62ae7f667de774c5a97 +MD5 (slideshow-0.8.0-pre5.tar.gz) = 96ddb609dc98389d38a2b99d6d488fe1 Index: files/patch-configure =================================================================== RCS file: files/patch-configure diff -N files/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-configure 4 Aug 2003 17:31:03 -0000 @@ -0,0 +1,22 @@ +--- configure.orig Mon Aug 4 17:20:08 2003 ++++ configure Mon Aug 4 17:20:32 2003 +@@ -9813,15 +9813,15 @@ + } + else + { +- printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the ++ printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the \ + minimum version\n", $smpeg_major_version, $smpeg_minor_version, + $smpeg_micro_version); +- printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is ++ printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is \ + correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); +- printf("*** If smpeg-config was wrong, set the environment variable ++ printf("*** If smpeg-config was wrong, set the environment variable \ + SMPEG_CONFIG\n"); +- printf("*** to point to the correct copy of smpeg-config, and remove ++ printf("*** to point to the correct copy of smpeg-config, and remove \ + the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; Index: files/patch-src::EffectDarkness.cpp =================================================================== RCS file: files/patch-src::EffectDarkness.cpp diff -N files/patch-src::EffectDarkness.cpp --- files/patch-src::EffectDarkness.cpp 8 Jan 2003 20:32:37 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ ---- src/EffectDarkness.cpp.orig Fri Nov 29 01:06:50 2002 -+++ src/EffectDarkness.cpp Fri Nov 29 01:07:20 2002 -@@ -52,8 +52,8 @@ - int dt = screen->format->BytesPerPixel; - - // Sorry, work to do -- assert (ds == 4 || ds == 3); -- assert (dt == 4 || ds == 3); -+ if (ds != 4 && ds != 3) return; -+ if (dt != 4 && ds != 3) return; - - - for (int i=0; i< parent_surface->w * parent_surface->h; i++) { Index: files/patch-src::FontVault.h =================================================================== RCS file: files/patch-src::FontVault.h diff -N files/patch-src::FontVault.h --- files/patch-src::FontVault.h 8 Jan 2003 20:32:37 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- src/FontVault.h.orig Fri Nov 22 00:07:06 2002 -+++ src/FontVault.h Thu Nov 28 23:41:37 2002 -@@ -34,7 +34,7 @@ - } - }; - --#if (HASHMAP_NAMESPACE == __gnu_cxx) -+#if defined(HAVE_GNU_CXX_HASHMAP) - typedef __gnu_cxx::hash_map Fonts_HashMap; - #else - typedef std::hash_map Fonts_HashMap; Index: files/patch-src::Makefile.in =================================================================== RCS file: /usr/home/ncvs/ports/multimedia/slideshow/files/patch-src::Makefile.in,v retrieving revision 1.1 diff -u -r1.1 patch-src::Makefile.in --- files/patch-src::Makefile.in 8 Jan 2003 20:32:37 -0000 1.1 +++ files/patch-src::Makefile.in 4 Aug 2003 17:31:03 -0000 @@ -1,11 +1,11 @@ ---- src/Makefile.in.orig Wed Nov 27 01:32:38 2002 -+++ src/Makefile.in Wed Nov 27 01:32:48 2002 -@@ -790,8 +790,6 @@ - uninstall-recursive +--- src/Makefile.in.orig Mon Aug 4 19:21:52 2003 ++++ src/Makefile.in Mon Aug 4 19:22:15 2003 +@@ -844,8 +844,6 @@ + else \ + echo "WARNING: You need swig in order to re-build slideshow_wrap.cxx"; \ + fi; +-SDL_defines.i : $(SDL_SDL_video_H) +- egrep '#define SDL_.*[[:space:]]0x[0-9]{8}' $(SDL_SDL_video_H) | grep -v OVERLAY | sed -e 's,[[:space:]]*/\*.*$$,,' >SDL_defines.i - --MgpLoaderLex.cpp: MgpLoader.ll -- flex++ -i -oMgpLoaderLex.cpp MgpLoader.ll - - # - # Python wrapper + # MgpLoaderLex.cpp \ + # MgpLoaderYacc.cpp Index: files/patch-src::Page.cpp =================================================================== RCS file: files/patch-src::Page.cpp diff -N files/patch-src::Page.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src::Page.cpp 4 Aug 2003 17:31:03 -0000 @@ -0,0 +1,10 @@ +--- src/Page.cpp.orig Mon Aug 4 17:22:29 2003 ++++ src/Page.cpp Mon Aug 4 17:22:51 2003 +@@ -28,6 +28,7 @@ + #include "Namer.h" + #include "Macros.h" + #include "Presentation.h" ++#include + #include + + using namespace std; --- slideshow.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: