diff options
| author | Brian Somers <brian@FreeBSD.org> | 2001-08-12 09:44:16 +0000 |
|---|---|---|
| committer | Brian Somers <brian@FreeBSD.org> | 2001-08-12 09:44:16 +0000 |
| commit | 0dea1d3200e232f55cabe614099af73ddd2fd9a2 (patch) | |
| tree | 0bf30dc2bb7c6ec58d2f893b06db92efd0e58b9a /graphics | |
| parent | Drop maintainership. (diff) | |
o Avoid modifying CFLAGS
o Create dsp.so when building with DEVFS in -current.
o Pass variables to CONFIGURE_ENV in appropriate style.
o Add missing libdvdcss.* to pkg-plist (bumping PORTREVISION).
o post-patch hack is to select proper libs (-pthread/-lc_r).
o Check XFREE86_VERSION for xvideo.so in pkg-plist.
Submitted by: FUJISHIMA Satsuki <sf@FreeBSD.org>
Notes
Notes:
svn path=/head/; revision=46122
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/vlc/Makefile | 20 | ||||
| -rw-r--r-- | graphics/vlc/files/patch-Makefile.opts.in | 18 | ||||
| -rw-r--r-- | graphics/vlc/files/patch-configure | 14 | ||||
| -rw-r--r-- | graphics/vlc/pkg-plist | 4 |
4 files changed, 51 insertions, 5 deletions
diff --git a/graphics/vlc/Makefile b/graphics/vlc/Makefile index 68407b6a3842..8fc791328602 100644 --- a/graphics/vlc/Makefile +++ b/graphics/vlc/Makefile @@ -7,6 +7,7 @@ PORTNAME= vlc PORTVERSION= 0.2.82 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \ ftp://ftp.Awfulhak.org/pub/vlc/ \ @@ -16,12 +17,23 @@ MAINTAINER= brian@Awfulhak.org LIB_DEPENDS= SDL-1.1:${PORTSDIR}/devel/sdl12 -HAS_CONFIGURE= yes -CONFIGURE_ENV= PATH_GTKCONFIG="${PREFIX}/bin/gtk12-config" \ - CPPFLAGS="-I${LOCALBASE}/include" \ +GNU_CONFIGURE= yes +CONFIGURE_ENV= PATH_GTKCONFIG="${GTK_CONFIG}" \ + CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib" USE_GTK= yes USE_GMAKE= yes USE_BZIP2= yes -.include <bsd.port.mk> +post-patch: + ${PERL} -pi.orig -e 's,-lpthread,${PTHREAD_LIBS},g' ${WRKSRC}/configure + +.include <bsd.port.pre.mk> + +.if ${XFREE86_VERSION} == 4 +PLIST_SUB= XF4="" +.else +PLIST_SUB= XF4="@comment " +.endif + +.include <bsd.port.post.mk> diff --git a/graphics/vlc/files/patch-Makefile.opts.in b/graphics/vlc/files/patch-Makefile.opts.in new file mode 100644 index 000000000000..23b7d5b96c22 --- /dev/null +++ b/graphics/vlc/files/patch-Makefile.opts.in @@ -0,0 +1,18 @@ +--- Makefile.opts.in.orig Tue Aug 7 19:55:49 2001 ++++ Makefile.opts.in Sun Aug 12 15:01:13 2001 +@@ -200,6 +200,7 @@ + CFLAGS += -fnative-struct -D_OFF_T_ -D_off_t=long + endif + ++ifeq ($(MODIFY_CFLAGS),1) + ifneq (,$(findstring bsd,$(SYS))) + CFLAGS += -pthread + endif +@@ -235,6 +236,7 @@ + endif + + #end of optimisations ++endif + endif + + # diff --git a/graphics/vlc/files/patch-configure b/graphics/vlc/files/patch-configure new file mode 100644 index 000000000000..d2a8c34e446d --- /dev/null +++ b/graphics/vlc/files/patch-configure @@ -0,0 +1,14 @@ +--- configure.orig Tue Aug 7 19:55:49 2001 ++++ configure Sun Aug 12 15:36:05 2001 +@@ -3924,10 +3924,7 @@ + + if test x$enable_dsp != xno + then +- if test -c /dev/dsp +- then +- PLUGINS="${PLUGINS} dsp" +- fi ++ PLUGINS="${PLUGINS} dsp" + fi + + # Check whether --enable-esd or --disable-esd was given. diff --git a/graphics/vlc/pkg-plist b/graphics/vlc/pkg-plist index f20dd09a6c33..b609b33b925a 100644 --- a/graphics/vlc/pkg-plist +++ b/graphics/vlc/pkg-plist @@ -2,12 +2,14 @@ bin/vlc bin/gvlc include/videolan/dvdcss.h lib/libdvdcss.a +lib/libdvdcss.so +lib/libdvdcss.so.0 lib/libdvdcss.so.0.0.2 lib/videolan/vlc/dsp.so lib/videolan/vlc/gtk.so lib/videolan/vlc/sdl.so lib/videolan/vlc/x11.so -lib/videolan/vlc/xvideo.so +%%XF4%%lib/videolan/vlc/xvideo.so share/videolan/default8x16.psf share/videolan/default8x9.psf share/videolan/gnome-vlc.png |