[Midnightbsd-cvs] mports [19969] trunk/multimedia/smpeg: fix autotools

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Aug 22 18:17:18 EDT 2015


Revision: 19969
          http://svnweb.midnightbsd.org/mports/?rev=19969
Author:   laffer1
Date:     2015-08-22 18:17:17 -0400 (Sat, 22 Aug 2015)
Log Message:
-----------
fix autotools

Modified Paths:
--------------
    trunk/multimedia/smpeg/Makefile
    trunk/multimedia/smpeg/files/patch-configure
    trunk/multimedia/smpeg/pkg-plist

Added Paths:
-----------
    trunk/multimedia/smpeg/files/patch-gtv.c
    trunk/multimedia/smpeg/files/patch-smpeg.m4
    trunk/multimedia/smpeg/files/patch-video__video.h

Removed Paths:
-------------
    trunk/multimedia/smpeg/files/patch-ab
    trunk/multimedia/smpeg/files/patch-ac
    trunk/multimedia/smpeg/files/patch-video::video.h

Property Changed:
----------------
    trunk/multimedia/smpeg/files/patch-MPEGaudio.h
    trunk/multimedia/smpeg/files/patch-configure

Modified: trunk/multimedia/smpeg/Makefile
===================================================================
--- trunk/multimedia/smpeg/Makefile	2015-08-22 22:15:03 UTC (rev 19968)
+++ trunk/multimedia/smpeg/Makefile	2015-08-22 22:17:17 UTC (rev 19969)
@@ -2,45 +2,33 @@
 
 PORTNAME=	smpeg
 PORTVERSION=	0.4.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://sunsite.auc.dk/pub/os/linux/loki/open-source/smpeg/ \
-		${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
+		GENTOO
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A free MPEG1 video player library with sound support
-LICENSE=	lgpl
+COMMENT=	Free MPEG1 video player library with sound support
 
-USE_AUTOTOOLS=	libtool
-WANT_GNOME=	yes
-USE_GMAKE=	yes
+LICENSE=	lgpl2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 GNU_CONFIGURE=	yes
+USES=		gmake libtool
 USE_SDL=	sdl
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	GLBASE="${LOCALBASE}" \
-		CC="${CXX}" REAL_CC="${CC}"
+		CC="${CXX}" REAL_CC="${CC}" \
+		SDL_CONFIG="${SDL_CONFIG}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-#If you want to try the opengl player (which doesn't seem to work)
+#If you want to try the opengl/gtk player (which doesn't seem to work)
 #comment out the following line.
 CONFIGURE_ARGS=	--disable-opengl-player \
+		--disable-gtk-player \
 		--enable-mmx
 
-MAN1=		gtv.1 plaympeg.1
+post-install:
+	${STRIP_CMD} ${PREFIX}/lib/libsmpeg.so
 
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mgtk12}!=""
-USE_GNOME+=	gtk12
-PLIST_SUB+=	GNOME=""
-.else
-CONFIGURE_ARGS+=	--disable-gtk-player
-PLIST_SUB+=	GNOME="@comment "
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
-		${WRKSRC}/configure
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Index: trunk/multimedia/smpeg/files/patch-MPEGaudio.h
===================================================================
--- trunk/multimedia/smpeg/files/patch-MPEGaudio.h	2015-08-22 22:15:03 UTC (rev 19968)
+++ trunk/multimedia/smpeg/files/patch-MPEGaudio.h	2015-08-22 22:17:17 UTC (rev 19969)

Property changes on: trunk/multimedia/smpeg/files/patch-MPEGaudio.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/multimedia/smpeg/files/patch-ab
===================================================================
--- trunk/multimedia/smpeg/files/patch-ab	2015-08-22 22:15:03 UTC (rev 19968)
+++ trunk/multimedia/smpeg/files/patch-ab	2015-08-22 22:17:17 UTC (rev 19969)
@@ -1,10 +0,0 @@
---- gtv.c.orig	Sun Mar 26 00:18:54 2000
-+++ gtv.c	Sun Mar 26 00:19:17 2000
-@@ -726,6 +726,7 @@
-     memset( &info, 0, sizeof( info ) );
-     memset( &filename_buffer, 0, sizeof( gchar ) * FILENAME_BUFFER_SIZE );
-     gtk_init( &argc, &argv );
-+    gtk_set_locale ();
- 
-     window = create_gtv_window( );
-     gtk_signal_connect( GTK_OBJECT( window ), "destroy",

Deleted: trunk/multimedia/smpeg/files/patch-ac
===================================================================
--- trunk/multimedia/smpeg/files/patch-ac	2015-08-22 22:15:03 UTC (rev 19968)
+++ trunk/multimedia/smpeg/files/patch-ac	2015-08-22 22:17:17 UTC (rev 19969)
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Apr 22 23:34:24 2000
-+++ Makefile.in	Sat Apr 22 23:34:38 2000
-@@ -103,7 +103,7 @@
- libsmpeginclude_HEADERS =  	MPEG.h				MPEGaction.h			MPEGaudio.h			MPEGerror.h			MPEGring.h			MPEGstream.h			MPEGvideo.h			smpeg.h
- 
- 
--libsmpeg_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libsmpeg_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
- 
- libsmpeg_la_LIBADD =  	audio/libaudio.la		video/libvideo.la

Modified: trunk/multimedia/smpeg/files/patch-configure
===================================================================
--- trunk/multimedia/smpeg/files/patch-configure	2015-08-22 22:15:03 UTC (rev 19968)
+++ trunk/multimedia/smpeg/files/patch-configure	2015-08-22 22:17:17 UTC (rev 19969)
@@ -1,8 +1,14 @@
-
-$FreeBSD: ports/multimedia/smpeg/files/patch-configure,v 1.1 2002/07/02 12:43:46 sobomax Exp $
-
 --- configure	2002/07/02 12:33:37	1.1
 +++ configure	2002/07/02 12:34:01
+@@ -1055,7 +1055,7 @@
+ #line 1056 "configure"
+ #include "confdefs.h"
+ 
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:1061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
 @@ -2335,6 +2335,7 @@
  
  CFLAGS="$CFLAGS $SDL_CFLAGS"


Property changes on: trunk/multimedia/smpeg/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/multimedia/smpeg/files/patch-gtv.c
===================================================================
--- trunk/multimedia/smpeg/files/patch-gtv.c	                        (rev 0)
+++ trunk/multimedia/smpeg/files/patch-gtv.c	2015-08-22 22:17:17 UTC (rev 19969)
@@ -0,0 +1,10 @@
+--- gtv.c.orig	Sun Mar 26 00:18:54 2000
++++ gtv.c	Sun Mar 26 00:19:17 2000
+@@ -726,6 +726,7 @@
+     memset( &info, 0, sizeof( info ) );
+     memset( &filename_buffer, 0, sizeof( gchar ) * FILENAME_BUFFER_SIZE );
+     gtk_init( &argc, &argv );
++    gtk_set_locale ();
+ 
+     window = create_gtv_window( );
+     gtk_signal_connect( GTK_OBJECT( window ), "destroy",


Property changes on: trunk/multimedia/smpeg/files/patch-gtv.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/smpeg/files/patch-smpeg.m4
===================================================================
--- trunk/multimedia/smpeg/files/patch-smpeg.m4	                        (rev 0)
+++ trunk/multimedia/smpeg/files/patch-smpeg.m4	2015-08-22 22:17:17 UTC (rev 19969)
@@ -0,0 +1,11 @@
+--- smpeg.m4.orig	2001-04-05 00:28:14.000000000 +0400
++++ smpeg.m4	2014-02-14 18:19:27.566113006 +0400
+@@ -10,7 +10,7 @@
+ ACTION-IF-NOT-FOUND]]])
+ dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_SMPEG,
++AC_DEFUN([AM_PATH_SMPEG],
+ [dnl
+ dnl Get the cflags and libraries from the smpeg-config script
+ dnl


Property changes on: trunk/multimedia/smpeg/files/patch-smpeg.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/multimedia/smpeg/files/patch-video::video.h
===================================================================
--- trunk/multimedia/smpeg/files/patch-video::video.h	2015-08-22 22:15:03 UTC (rev 19968)
+++ trunk/multimedia/smpeg/files/patch-video::video.h	2015-08-22 22:17:17 UTC (rev 19969)
@@ -1,11 +0,0 @@
---- video/video.h.orig	Sun Feb  8 23:39:25 2004
-+++ video/video.h	Sun Feb  8 23:39:36 2004
-@@ -432,7 +432,7 @@
- #undef  LITTLE_ENDIAN_ARCHITECTURE
- #define BIG_ENDIAN_ARCHITECTURE 1
- #else
--#include <endian.h>
-+#include <sys/endian.h>
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- #undef  BIG_ENDIAN_ARCHITECTURE
- #define LITTLE_ENDIAN_ARCHITECTURE 1

Added: trunk/multimedia/smpeg/files/patch-video__video.h
===================================================================
--- trunk/multimedia/smpeg/files/patch-video__video.h	                        (rev 0)
+++ trunk/multimedia/smpeg/files/patch-video__video.h	2015-08-22 22:17:17 UTC (rev 19969)
@@ -0,0 +1,11 @@
+--- video/video.h.orig	Sun Feb  8 23:39:25 2004
++++ video/video.h	Sun Feb  8 23:39:36 2004
+@@ -432,7 +432,7 @@
+ #undef  LITTLE_ENDIAN_ARCHITECTURE
+ #define BIG_ENDIAN_ARCHITECTURE 1
+ #else
+-#include <endian.h>
++#include <sys/endian.h>
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+ #undef  BIG_ENDIAN_ARCHITECTURE
+ #define LITTLE_ENDIAN_ARCHITECTURE 1


Property changes on: trunk/multimedia/smpeg/files/patch-video__video.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/multimedia/smpeg/pkg-plist
===================================================================
--- trunk/multimedia/smpeg/pkg-plist	2015-08-22 22:15:03 UTC (rev 19968)
+++ trunk/multimedia/smpeg/pkg-plist	2015-08-22 22:17:17 UTC (rev 19969)
@@ -1,4 +1,3 @@
-%%GNOME%%bin/gtv
 bin/plaympeg
 bin/smpeg-config
 include/smpeg/MPEG.h
@@ -12,9 +11,10 @@
 include/smpeg/MPEGsystem.h
 include/smpeg/MPEGvideo.h
 include/smpeg/smpeg.h
+lib/libsmpeg-0.4.so.0
+lib/libsmpeg-0.4.so.0.1.3
 lib/libsmpeg.a
-lib/libsmpeg.la
 lib/libsmpeg.so
-lib/libsmpeg.so.1
 share/aclocal/smpeg.m4
- at dirrm include/smpeg
+man/man1/gtv.1.gz
+man/man1/plaympeg.1.gz



More information about the Midnightbsd-cvs mailing list