From 1732752dddf5a066e6fae2a031fda8e326962eea Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Mon, 12 Aug 2002 18:15:20 +0000 Subject: Roll mpeg-lib into the two gimp ports. mpeg-lib is now abandoned ware, and will be removed from the ports tree soon. mpeg-lib will now be built solely for the purpose of gimp, and no libmpeg.* will be installed on the system. This will avoid a namespace conflict with KDE which also installs a libmpeg.so. These two libraries are incompatible. Submitted by: alane and myself Not reviewed by: alane Inspired by: mail/evolution --- graphics/gimp-app-devel/Makefile | 44 ++++++++++++++++++++-- graphics/gimp-app-devel/distinfo | 1 + .../files/patch-..::mpeg_lib-1.3.1::Makefile.in | 25 ++++++++++++ .../files/patch-..::mpeg_lib-1.3.1::video.c | 23 +++++++++++ 4 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 graphics/gimp-app-devel/files/patch-..::mpeg_lib-1.3.1::Makefile.in create mode 100644 graphics/gimp-app-devel/files/patch-..::mpeg_lib-1.3.1::video.c (limited to 'graphics/gimp-app-devel') diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile index b7c921a3a404..c58f89705d8c 100644 --- a/graphics/gimp-app-devel/Makefile +++ b/graphics/gimp-app-devel/Makefile @@ -7,20 +7,24 @@ PORTNAME= gimp PORTVERSION= 1.3.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \ ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} + ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} \ + ftp://ftp.bic.mni.mcgill.ca/pub/mpeg/:mpeg \ + http://starship.python.net/~gward/mpeglib/:mpeg MASTER_SITE_SUBDIR= gimp/v${PORTVERSION:R}/v${PORTVERSION} +DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ + mpeg_lib-1.3.1.tar.gz:mpeg -MAINTAINER= vanilla@FreeBSD.org +MAINTAINER= gnome@FreeBSD.org LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \ aa.1:${PORTSDIR}/graphics/aalib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff @@ -34,14 +38,46 @@ USE_XPM= yes USE_GMAKE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes +USE_REINPLACE= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore PLIST_SUB= SHLIBVER="${SHLIBVER}" CONFIGURE_ARGS= --disable-perl \ --with-html-dir=${PREFIX}/share/doc/gimp -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -I${MPEG_WRKSRC}" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +GIMP_DISTFILE= ${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} +MPEG_DISTFILE= ${DISTDIR}/mpeg_lib-1.3.1.tar.gz +MPEG_WRKSRC= ${WRKDIR}/mpeg_lib-1.3.1 +MPEG_CONFIGURE_ENV= OPTIMIZE="${CFLAGS}" +MPEG_CONFIGURE_ARGS= --prefix=${PREFIX} \ + --target=${ARCH}-unknown-freebsd${OSREL} + MAN1= escputil-1.3.1 gimp-1.3.1 gimptool-1.3.1 MAN5= gimprc-1.3.5 +do-extract: + @${MKDIR} ${WRKDIR} + @(cd ${WRKDIR} && ${BZIP2_CMD} -dc ${GIMP_DISTFILE} | ${TAR} -xf -) + @(cd ${WRKDIR} && ${GZIP_CMD} -dc ${MPEG_DISTFILE} | ${TAR} -xf -) + @(${FIND} ${MPEG_WRKSRC} -type f | ${XARGS} ${CHMOD} u+w) + +pre-configure: + @(cd ${MPEG_WRKSRC} && \ + ${SETENV} CC="${CC}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \ + INSTALL_DATA="${INSTALL_DATA}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + ${MPEG_CONFIGURE_ENV} ./configure ${MPEG_CONFIGURE_ARGS}) + @(cd ${MPEG_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + +post-patch: + @${REINPLACE_CMD} -e 's|-lmpeg|${MPEG_WRKSRC}/libmpeg.a|g' \ + ${WRKSRC}/configure + @(cd ${MPEG_WRKSRC} ; \ + ${GREP} -r -l "" * | \ + ${XARGS} ${REINPLACE_CMD} -e "s///") + .include diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo index 573254bc947c..b1efce465cde 100644 --- a/graphics/gimp-app-devel/distinfo +++ b/graphics/gimp-app-devel/distinfo @@ -1 +1,2 @@ MD5 (gimp-1.3.3.tar.bz2) = 143d92b776984213eeee5eeac8d90fa8 +MD5 (mpeg_lib-1.3.1.tar.gz) = 9d803be0073f42acf87d5fbb339a183b diff --git a/graphics/gimp-app-devel/files/patch-..::mpeg_lib-1.3.1::Makefile.in b/graphics/gimp-app-devel/files/patch-..::mpeg_lib-1.3.1::Makefile.in new file mode 100644 index 000000000000..e9163f5a33c4 --- /dev/null +++ b/graphics/gimp-app-devel/files/patch-..::mpeg_lib-1.3.1::Makefile.in @@ -0,0 +1,25 @@ +--- ../mpeg_lib-1.3.1/Makefile.in.orig Thu Nov 26 11:03:29 1998 ++++ ../mpeg_lib-1.3.1/Makefile.in Tue Jul 9 22:28:11 2002 +@@ -19,7 +19,7 @@ + exec_prefix = @exec_prefix@ + INSTALL_INCLUDE = @includedir@ + INSTALL_LIBRARY = @libdir@ +-INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ + + # Other miscellaneous programs + AR = @AR@ +@@ -67,10 +67,9 @@ + $(CC) -shared -o $(SHLIB) $(LIBOBJ) + + install: $(LIBRARY) +- $(INSTALL) -d $(INSTALL_INCLUDE) $(INSTALL_LIBRARY) +- $(INSTALL) -m 0644 $(HEADER) $(INSTALL_INCLUDE)/$(HEADER) +- $(INSTALL) -m 0644 $(LIBRARY) $(INSTALL_LIBRARY)/$(LIBRARY) +- @if test -f $(SHLIB) ; then echo "warning: $(SHLIB) *not* installed (installing shared libraries is too system-specific)" ; fi ++ $(MKDIR) $(INSTALL_INCLUDE) $(INSTALL_LIBRARY) ++ $(INSTALL_DATA) $(HEADER) $(INSTALL_INCLUDE)/$(HEADER) ++ $(INSTALL_DATA) $(LIBRARY) $(INSTALL_LIBRARY)/$(LIBRARY) + + clean: + rm -f $(LIBRARY) $(EXTRAS) $(LIBOBJ) core diff --git a/graphics/gimp-app-devel/files/patch-..::mpeg_lib-1.3.1::video.c b/graphics/gimp-app-devel/files/patch-..::mpeg_lib-1.3.1::video.c new file mode 100644 index 000000000000..5707b750300d --- /dev/null +++ b/graphics/gimp-app-devel/files/patch-..::mpeg_lib-1.3.1::video.c @@ -0,0 +1,23 @@ +--- ../mpeg_lib-1.3.1/video.c.orig Sat Jul 24 13:00:51 1999 ++++ ../mpeg_lib-1.3.1/video.c Tue Aug 31 23:11:56 1999 +@@ -49,6 +49,10 @@ + #include "proto.h" + #include "my_dmalloc.h" + ++#ifdef _HAVE_PARAM_H ++#include ++#endif ++ + /* Declarations of functions. */ + static void ReconIMBlock(VidStream *,int); + static void ReconPMBlock(VidStream *,int,int,int,int); +@@ -445,7 +449,9 @@ + static int num_calls = 0; + unsigned int data; + int i, status; ++#if BSD < 199103 + long int ftell (FILE *stream); ++#endif + + /* If vid_stream is null, create new VidStream structure. */ + -- cgit v1.2.3