diff options
| author | brian <brian@FreeBSD.org> | 2002-03-29 06:18:30 +0800 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 2002-03-29 06:18:30 +0800 |
| commit | 311663c85e94b2adb9e5de6b27ab23b9c6f3b44b (patch) | |
| tree | bd37a093ea529821e0a7c0b3e1dbe0e3ca9550b7 /multimedia/vlc | |
| parent | d81dac60e2854c6e0587943c5f83d87707bb5b73 (diff) | |
| download | freebsd-ports-gnome-311663c85e94b2adb9e5de6b27ab23b9c6f3b44b.tar.gz freebsd-ports-gnome-311663c85e94b2adb9e5de6b27ab23b9c6f3b44b.tar.zst freebsd-ports-gnome-311663c85e94b2adb9e5de6b27ab23b9c6f3b44b.zip | |
Use graphics/libdvdcss rather than spamming any existing libdvdcss
installation.
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/Makefile | 9 | ||||
| -rw-r--r-- | multimedia/vlc/files/patch-extras::libdvdcss::videolan::dvdcss.h | 16 | ||||
| -rw-r--r-- | multimedia/vlc/files/patch-libdvdcss | 21 | ||||
| -rw-r--r-- | multimedia/vlc/pkg-plist | 6 |
4 files changed, 26 insertions, 26 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index f73ff04c1e61..52ad2d224bcd 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -14,7 +14,8 @@ MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \ MAINTAINER= brian@FreeBSD.org -LIB_DEPENDS= SDL-1.1:${PORTSDIR}/devel/sdl12 +LIB_DEPENDS= dvdcss.1:${PORTSDIR}/graphics/libdvdcss + GNU_CONFIGURE= yes CONFIGURE_ENV= PATH_GTKCONFIG="${GTK_CONFIG}" \ @@ -22,12 +23,12 @@ CONFIGURE_ENV= PATH_GTKCONFIG="${GTK_CONFIG}" \ INCLUDE="-I${LOCALBASE}/include" \ LIB="-L${LOCALBASE}/lib" \ LDFLAGS="-L${LOCALBASE}/lib" + +CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} + USE_GTK= yes USE_GMAKE= yes USE_BZIP2= yes -PLIST_SUB= LIB_DATE="${LIB_DATE}" - -LIB_DATE!= date +%Y-%m-%d post-patch: ${PERL} -pi.orig -e 's,-lpthread,${PTHREAD_LIBS},g' ${WRKSRC}/configure diff --git a/multimedia/vlc/files/patch-extras::libdvdcss::videolan::dvdcss.h b/multimedia/vlc/files/patch-extras::libdvdcss::videolan::dvdcss.h deleted file mode 100644 index c44bc3629b10..000000000000 --- a/multimedia/vlc/files/patch-extras::libdvdcss::videolan::dvdcss.h +++ /dev/null @@ -1,16 +0,0 @@ ---- extras/libdvdcss/videolan/dvdcss.h.orig Sun Oct 14 20:58:16 2001 -+++ extras/libdvdcss/videolan/dvdcss.h Sun Oct 14 20:59:33 2001 -@@ -22,6 +22,8 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - *****************************************************************************/ - -+#ifndef __DVDCSS_H__ -+#define __DVDCSS_H__ 1 - /***************************************************************************** - * The libdvdcss structure - *****************************************************************************/ -@@ -59,3 +61,4 @@ - int i_flags ); - extern char * dvdcss_error ( dvdcss_handle ); - -+#endif diff --git a/multimedia/vlc/files/patch-libdvdcss b/multimedia/vlc/files/patch-libdvdcss new file mode 100644 index 000000000000..66b6c389303a --- /dev/null +++ b/multimedia/vlc/files/patch-libdvdcss @@ -0,0 +1,21 @@ +--- extras/libdvdcss/Makefile.orig Fri Aug 24 10:20:05 2001 ++++ extras/libdvdcss/Makefile Thu Mar 28 19:53:04 2002 +@@ -44,18 +44,6 @@ + all: ../../lib/$(FULL_SO) ../../lib/$(BASE_A) + + install: +- mkdir -p $(DESTDIR)$(includedir)/videolan +- $(INSTALL) -m 644 videolan/dvdcss.h $(DESTDIR)$(includedir)/videolan +- mkdir -p $(DESTDIR)$(libdir) +- -$(INSTALL) -m 644 ../../lib/$(BASE_A) $(DESTDIR)$(libdir) +- -$(INSTALL) -m 644 ../../lib/$(FULL_SO) $(DESTDIR)$(libdir) +- rm -f $(DESTDIR)$(libdir)/$(BASE_SO) && ln -s $(FULL_SO) $(DESTDIR)$(libdir)/$(BASE_SO) +- rm -f $(DESTDIR)$(libdir)/$(MAJOR_SO) && ln -s $(FULL_SO) $(DESTDIR)$(libdir)/$(MAJOR_SO) + + uninstall: +- rm -f $(DESTDIR)$(includedir)/videolan/dvdcss.h +- rm -f $(DESTDIR)$(libdir)/$(BASE_A) +- rm -f $(DESTDIR)$(libdir)/$(BASE_SO) +- rm -f $(DESTDIR)$(libdir)/$(MAJOR_SO) +- rm -f $(DESTDIR)$(libdir)/$(FULL_SO) + diff --git a/multimedia/vlc/pkg-plist b/multimedia/vlc/pkg-plist index a5f27286a828..24a90b74bb0c 100644 --- a/multimedia/vlc/pkg-plist +++ b/multimedia/vlc/pkg-plist @@ -1,10 +1,5 @@ bin/vlc bin/gvlc -include/videolan/dvdcss.h -lib/libdvdcss.a -lib/libdvdcss.so -lib/libdvdcss.so.1 -lib/libdvdcss.so.1.0.1_%%LIB_DATE%% lib/videolan/vlc/ac3_spdif.so lib/videolan/vlc/dsp.so lib/videolan/vlc/gtk.so @@ -25,5 +20,4 @@ share/videolan/qvlc.xpm share/videolan/vlc.xpm @dirrm lib/videolan/vlc @dirrm lib/videolan -@dirrm include/videolan @dirrm share/videolan |