diff options
| -rw-r--r-- | multimedia/slideshow/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/slideshow/distinfo | 2 | ||||
| -rw-r--r-- | multimedia/slideshow/files/patch-configure | 22 | ||||
| -rw-r--r-- | multimedia/slideshow/files/patch-src::EffectDarkness.cpp | 13 | ||||
| -rw-r--r-- | multimedia/slideshow/files/patch-src::Makefile.in | 20 | ||||
| -rw-r--r-- | multimedia/slideshow/files/patch-src::Page.cpp | 10 | ||||
| -rw-r--r-- | multimedia/slideshow/pkg-message | 2 |
7 files changed, 46 insertions, 28 deletions
diff --git a/multimedia/slideshow/Makefile b/multimedia/slideshow/Makefile index aa1e9a2c1c1e..d40380cc2f14 100644 --- a/multimedia/slideshow/Makefile +++ b/multimedia/slideshow/Makefile @@ -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 @@ LIB_DEPENDS= SDL_ttf.3:${PORTSDIR}/graphics/sdl_ttf \ 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 @@ do-install: post-install: @${STRIP_CMD} ${PREFIX}/lib/libslideshow.so.0 # @${STRIP_CMD} ${PYTHONPREFIX_SITELIBDIR}/_slideshow.so - @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/multimedia/slideshow/distinfo b/multimedia/slideshow/distinfo index ddf26e0a5a6e..fde9f1d0d06d 100644 --- a/multimedia/slideshow/distinfo +++ b/multimedia/slideshow/distinfo @@ -1 +1 @@ -MD5 (slideshow-0.8.0-pre4.tar.gz) = b17746903b43c62ae7f667de774c5a97 +MD5 (slideshow-0.8.0-pre5.tar.gz) = 96ddb609dc98389d38a2b99d6d488fe1 diff --git a/multimedia/slideshow/files/patch-configure b/multimedia/slideshow/files/patch-configure new file mode 100644 index 000000000000..d3c3dd5a7ed4 --- /dev/null +++ b/multimedia/slideshow/files/patch-configure @@ -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; diff --git a/multimedia/slideshow/files/patch-src::EffectDarkness.cpp b/multimedia/slideshow/files/patch-src::EffectDarkness.cpp deleted file mode 100644 index 1516ff993e60..000000000000 --- a/multimedia/slideshow/files/patch-src::EffectDarkness.cpp +++ /dev/null @@ -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++) { diff --git a/multimedia/slideshow/files/patch-src::Makefile.in b/multimedia/slideshow/files/patch-src::Makefile.in index e22622e96bee..5a0092030a6d 100644 --- a/multimedia/slideshow/files/patch-src::Makefile.in +++ b/multimedia/slideshow/files/patch-src::Makefile.in @@ -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 diff --git a/multimedia/slideshow/files/patch-src::Page.cpp b/multimedia/slideshow/files/patch-src::Page.cpp new file mode 100644 index 000000000000..1aa7509e38f0 --- /dev/null +++ b/multimedia/slideshow/files/patch-src::Page.cpp @@ -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 <cassert> + #include <iostream> + + using namespace std; diff --git a/multimedia/slideshow/pkg-message b/multimedia/slideshow/pkg-message deleted file mode 100644 index 3ecc67ad1aaa..000000000000 --- a/multimedia/slideshow/pkg-message +++ /dev/null @@ -1,2 +0,0 @@ -This port still has some bugs when used with a colour depth less than 24 bits. -For now, your have to use this depth for full functionality. |