aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/handbrake/Makefile30
-rw-r--r--multimedia/libdvdcss/Makefile43
-rw-r--r--multimedia/libdvdcss/pkg-plist4
-rw-r--r--multimedia/libdvdread/Makefile16
-rw-r--r--multimedia/libxine/Makefile71
-rw-r--r--multimedia/libxine/files/patch-config.rpath12
-rw-r--r--multimedia/libxine/files/patch-misc_Makefile.in11
-rw-r--r--multimedia/libxine/files/patch-misc_libxine.pc.in14
-rw-r--r--multimedia/libxine/pkg-descr2
-rw-r--r--multimedia/libxine/pkg-plist1
10 files changed, 52 insertions, 152 deletions
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 5fc6b6c14c33..8d1ab31fed3a 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -28,7 +28,8 @@ COMMENT= Versatile DVD ripper and video transcoder
LICENSE= GPLv2
-BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm
+BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool \
+ yasm:${PORTSDIR}/devel/yasm
LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
libfreetype.so:${PORTSDIR}/print/freetype2 \
libfribidi.so:${PORTSDIR}/converters/fribidi \
@@ -40,13 +41,15 @@ LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
libtheoradec.so:${PORTSDIR}/multimedia/libtheora \
libtheoraenc.so:${PORTSDIR}/multimedia/libtheora \
libsamplerate.so:${PORTSDIR}/audio/libsamplerate
-RUN_DEPENDS= ${LOCALBASE}/lib/libdvdcss.so:${PORTSDIR}/multimedia/libdvdcss
+.if !defined(PACKAGE_BUILDING)
+# DVDCSS version hardcoded in contrib/libdvdread/libdvdread/src/dvd_input.c (dlopen'ed)
+LIB_DEPENDS+= ${LOCALBASE}/lib/libdvdcss.so.2:${PORTSDIR}/multimedia/libdvdcss
+.endif
-USES= gmake pkgconfig iconv
-USE_AUTOTOOLS= libtool aclocal
-LIBTOOLFILES= configure
+GNU_CONFIGURE= yes
+USES= gmake iconv libtool pkgconfig
+USE_AUTOTOOLS= autoconf:env automake:env
USE_PYTHON_BUILD= yes
-WANT_GNOME= yes
WRKSRC= ${WRKDIR}/HandBrake-${PORTVERSION}
PLIST_FILES= bin/HandBrakeCLI
@@ -65,22 +68,22 @@ OPTIONS_DEFINE= X11
X11_DESC= Build GTK+2 based GUI program
OPTIONS_DEFAULT= X11
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
# Recent GNU binutils are required to handle inline SSSE3 asm (in x264), and
# to support --exclude-libs option for ld(1) when building GUI program
.if ${PORT_OPTIONS:MX11} || ${OSVERSION} < 802509 || \
${OSVERSION} >= 900000 && ${OSVERSION} < 900033
BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:${PORTSDIR}/devel/binutils
-CONFIGURE_ENV= COMPILER_PATH=${LOCALBASE}/bin
-MAKE_ENV= COMPILER_PATH=${LOCALBASE}/bin
+CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
+MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
.endif
.if ${PORT_OPTIONS:MX11}
CONFIGURE_ARGS+= --disable-gtk-update-checks --disable-gst
LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
libnotify.so:${PORTSDIR}/devel/libnotify
-USE_GNOME= gtk20
+USE_GNOME+= gtk20
PLIST_FILES+= bin/HandBrake
.else
CONFIGURE_ARGS+= --disable-gtk
@@ -93,9 +96,6 @@ LDFLAGS+= -lc++
LDFLAGS+= -lstdc++
.endif
-run-autotools-aclocal:
- @${DO_NADA}
-
# HandBrake tries to fetch its dependencies during build phase, which is not
# considered good in FreeBSD. Instead, we will prepare everything manually.
post-extract: .SILENT
@@ -135,8 +135,6 @@ post-patch:
@${REINPLACE_CMD} -e 's|-ldl|-lc| ; s|\[dl\]|[c]|' \
${BUILD_WRKSRC}/contrib/libbluray/libbluray-0.2.3/configure.ac
@${REINPLACE_CMD} -e 's|<malloc|<stdlib|' ${WRKSRC}/libhb/fifo.c
- @${REINPLACE_CMD} -e 's|libdvdcss\.so\.2|libdvdcss.so|' \
- ${BUILD_WRKSRC}/contrib/libdvdread/libdvdread/src/dvd_input.c
@${FIND} ${WRKSRC} -type f -name '*.[ch]' -print0 | ${XARGS} -0 \
${REINPLACE_CMD} -e '/#include/s|hb\.h|hb-of-handbrake.h|'
@${REINPLACE_CMD} -e "s|ToolProbe( 'GCC.gcc', 'gcc',|ToolProbe( 'GCC.gcc', '${CC}',|" \
@@ -160,4 +158,4 @@ do-install:
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gtk/src/ghb ${STAGEDIR}${PREFIX}/bin/HandBrake
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index 9e63dd73666e..9a2abaf109cb 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libdvdcss
PORTVERSION= 1.2.12
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://download.videolan.org/pub/%SUBDIR%/
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
@@ -12,49 +13,33 @@ COMMENT= Portable abstraction library for DVD decryption
RESTRICTED= CSS code may violate the DMCA
-USE_AUTOTOOLS= libtool
-USE_BZIP2= yes
-USE_GMAKE= yes
GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
+USES= gmake libtool pathfix tar:bzip2
USE_LDCONFIG= yes
-.ifndef(WITH_DOXYGEN)
-NOPORTDOCS= yes
-.endif
+OPTIONS_DEFINE= DOXYGEN
-.ifndef(NOPORTDOCS)
-BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MDOXYGEN}
+BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen
PORTDOCS= *
.endif
-NO_STAGE= yes
-pre-everything::
-.if !defined(WITH_DOXYGEN)
- @${ECHO_MSG} '==> Define WITH_DOXYGEN to build API documentation'
-.endif
-
post-patch:
- @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/src/ioctl.c
- ${REINPLACE_CMD} -e '/^pkgconfigdir/s|$$(libdir)|$$(libdir)data|' \
- ${WRKSRC}/src/Makefile.in
-# should we disable doc building?
-.ifdef(NOPORTDOCS)
- @${REINPLACE_CMD} -E \
- -e 's|^([[:space:]]*SUBDIRS[[:space:]]*=.*)doc|\1|' \
- ${BUILD_WRKSRC}/Makefile.in
-.else
+.if ${PORT_OPTIONS:MDOXYGEN}
# we do not want the latex documents... too many dependencies just
# to get in ps what we already have in html
- @${REINPLACE_CMD} -E \
- -e 's|^([[:space:]]*all:[[:space:]]*.*)stamp-latex|\1|' \
- ${BUILD_WRKSRC}/doc/Makefile.in
+ @${REINPLACE_CMD} '/^all:/s/stamp-latex//' ${WRKSRC}/doc/Makefile.in
+.else
+ @${REINPLACE_CMD} '/^SUBDIRS =/s/doc//' ${WRKSRC}/Makefile.in
.endif
post-install:
-.ifndef(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- @${INSTALL_DATA} ${INSTALL_WRKSRC}/doc/html/* ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOXYGEN}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${INSTALL_WRKSRC}/doc/html/* ${STAGEDIR}${DOCSDIR}
.endif
.include <bsd.port.mk>
diff --git a/multimedia/libdvdcss/pkg-plist b/multimedia/libdvdcss/pkg-plist
index 9059f2dff303..d02a0b5236f9 100644
--- a/multimedia/libdvdcss/pkg-plist
+++ b/multimedia/libdvdcss/pkg-plist
@@ -1,7 +1,7 @@
include/dvdcss/dvdcss.h
lib/libdvdcss.a
-lib/libdvdcss.la
lib/libdvdcss.so
-lib/libdvdcss.so.3
+lib/libdvdcss.so.2
+lib/libdvdcss.so.2.1.0
libdata/pkgconfig/libdvdcss.pc
@dirrm include/dvdcss
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index ae742497e08c..edf8e93b4b7e 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libdvdread
PORTVERSION= 4.9.9
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://dvdnav.mplayerhq.hu/releases/ \
http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
@@ -14,25 +15,16 @@ COMMENT= MPlayer version of the libdvdread project
LICENSE= GPLv2
GNU_CONFIGURE= yes
-USES= tar:xz gmake pkgconfig:build
+INSTALL_TARGET= install-strip
+USES= gmake libtool:oldver pathfix pkgconfig tar:xz
USE_LDCONFIG= yes
OPTIONS_DEFINE= DVDCSS
.if !defined(PACKAGE_BUILDING)
OPTIONS_DEFAULT= DVDCSS
.endif
-DVDCSS_LIB_DEPENDS= libdvdcss.so:${PORTSDIR}/multimedia/libdvdcss
# DVDCSS version hardcoded in src/dvd_input.c (dlopen'ed)
-DVDCSS_LIBVERSION= 3
-
-post-patch:
- @${REINPLACE_CMD} 's|^pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -E -e 's|(libdvdcss.so)\.2|\1.${DVDCSS_LIBVERSION}|' \
- ${WRKSRC}/src/dvd_input.c
-
-post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdvdread.so.5
+DVDCSS_LIB_DEPENDS= libdvdcss.so.2:${PORTSDIR}/multimedia/libdvdcss
.include <bsd.port.mk>
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 2e4f61277984..9de87e9f9258 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xine
PORTVERSION= 1.2.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= multimedia ipv6
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
PKGNAMEPREFIX= lib
@@ -12,6 +12,7 @@ DISTNAME= ${PORTNAME}-lib-${PORTVERSION}
MAINTAINER= nox@FreeBSD.org
COMMENT= Libraries for xine multimedia player
+BUILD_DEPENDS= v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat
LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac \
liba52.so:${PORTSDIR}/audio/liba52 \
libvorbis.so:${PORTSDIR}/audio/libvorbis \
@@ -30,27 +31,21 @@ LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac \
libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
libfaad.so:${PORTSDIR}/audio/faad \
libvdpau.so:${PORTSDIR}/multimedia/libvdpau
-
-BUILD_DEPENDS+= v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat
-
.if !defined(PACKAGE_BUILDING)
-LIB_DEPENDS+= libdvdcss.so.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
+# DVDCSS version hardcoded in src/input/input_dvd.c misc/cdda_server.c
+# and src/input/libdvdnav/dvd_input.c (dlopen'ed)
+LIB_DEPENDS+= libdvdcss.so.2:${PORTSDIR}/multimedia/libdvdcss
.endif
-USES= gmake iconv pathfix perl5 pkgconfig compiler:features tar:xz
+USES= compiler gmake iconv libtool:keepla pathfix perl5 pkgconfig tar:xz
GNU_CONFIGURE= yes
-WANT_GNOME= yes
-USE_XORG= sm x11 xv xinerama
+USE_XORG= x11 xv xinerama
USE_GL= gl glu
USE_PERL5= build
USE_SDL= sdl
USE_LDCONFIG= yes
-CONFIGURE_ENV= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- THREAD_LIBS="${PTHREAD_LIBS}" \
- EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm"
-CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg
+CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${LOCALBASE}/include/ffmeg
CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 \
--enable-ipv6 \
--with-external-libmad \
@@ -65,24 +60,14 @@ CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 \
--enable-dvb
OPTIONS_DEFINE= CACA ESOUND JACK GNOMEVFS2 PULSEAUDIO XVMC SMB AALIB \
- IMAGEMAGICK GTK2 WAVPACK VAAPI LIBBLURAY
+ IMAGEMAGICK PIXBUF WAVPACK VAAPI LIBBLURAY
DOCSDIR= ${PREFIX}/share/doc/xine-lib
# Please sync with XINE_PLUGINSDIR in multimedia/xine
# and multimedia/vdr-plugin-xineliboutput
PLIST_SUB= PLUGINSDIR="lib/xine/plugins/2.3"
-# DVDCSS version hardcoded in src/input/input_dvd.c misc/cdda_server.c
-# and src/input/libdvdnav/dvd_input.c (dlopen'ed)
-DVDCSS_LIBVERSION= 3
-
-PATCH_DIST_ARGS= -d ${WRKSRC} -p1 --forward --quiet
-
-.include <bsd.port.pre.mk>
-
-.if ${COMPILER_TYPE} != "clang"
-CFLAGS+= -fno-force-addr
-.endif
+.include <bsd.port.options.mk>
.if ${ARCH} == "i386"
CFLAGS+= -fomit-frame-pointer
@@ -169,7 +154,7 @@ PLIST_SUB+= WITH_AALIB="@comment "
CONFIGURE_ARGS+= --disable-aalib --disable-aalibtest
.endif
-.if ${PORT_OPTIONS:MMAGICK}
+.if ${PORT_OPTIONS:MIMAGEMAGICK}
LIB_DEPENDS+= libMagickWand.so:${PORTSDIR}/graphics/ImageMagick
PLIST_SUB+= WITH_IMAGEMAGICK=""
.else
@@ -177,8 +162,8 @@ PLIST_SUB+= WITH_IMAGEMAGICK="@comment "
CONFIGURE_ARGS+= --without-imagemagick
.endif
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+= gtk20
+.if ${PORT_OPTIONS:MPIXBUF}
+USE_GNOME+= gdkpixbuf2
PLIST_SUB+= WITH_GTK2=""
.else
PLIST_SUB+= WITH_GTK2="@comment "
@@ -224,6 +209,8 @@ PLIST_SUB+= WITH_VIDIX="@comment "
CONFIGURE_ARGS+= --disable-vidix
.endif
+.include <bsd.port.pre.mk>
+
post-patch:
.if ${COMPILER_TYPE} == "clang"
@${REINPLACE_CMD} -e 's|-fno-rename-registers||' \
@@ -233,36 +220,10 @@ post-patch:
@${REINPLACE_CMD} -e 's|-ldl||' \
${WRKSRC}/src/video_out/Makefile.in
.endif
-.for f in libtool ltmain.sh
- @${REINPLACE_CMD} -e \
- '/freebsd-elf)/,/;;/ s|major="\.$$current"|major=.`expr $$current - $$age`|; \
- /freebsd-elf)/,/;;/ s|versuffix="\.$$current"|versuffix="$$major"|' \
- ${WRKSRC}/${f}
-.endfor
- @${REINPLACE_CMD} -E -e 's|(libdvdcss.so)\.2|\1.${DVDCSS_LIBVERSION}|' \
- ${WRKSRC}/src/input/input_dvd.c
- @${REINPLACE_CMD} -E -e 's|(libdvdcss.so)\.2|\1.${DVDCSS_LIBVERSION}|' \
- ${WRKSRC}/misc/cdda_server.c
- @${REINPLACE_CMD} -E -e 's|(libdvdcss.so)\.2|\1.${DVDCSS_LIBVERSION}|' \
- ${WRKSRC}/src/input/libdvdnav/dvd_input.c
@${REINPLACE_CMD} -e "s|#define _ATOM QT_ATOM('', '', '', '')||" \
${WRKSRC}/src/demuxers/demux_qt.c
-
-pre-configure:
- @${REINPLACE_CMD} -e \
- 's|THREAD_LIBS=".*"|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
- s|THREAD_CFLAGS=".*"|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
- s|-L/usr/local/lib||g ; \
- s|-I/usr/local/include||g ; \
- s|-lgiconv|${ICONV_LIB}|g ; \
- s|-funroll-loops||g ; \
- s|LIBFFMPEG_CFLAGS|LIBFFMPEG_CPPFLAGS|g ; \
- s|echo aout|echo elf|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e \
- 's|-malign-loops|-falign-loops|g ; \
- s|-malign-jumps|-falign-jumps|g ; \
- s|-malign-functions|-falign-functions|g ; \
- s|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \
+ 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|' \
${WRKSRC}/configure
.include <bsd.port.post.mk>
diff --git a/multimedia/libxine/files/patch-config.rpath b/multimedia/libxine/files/patch-config.rpath
deleted file mode 100644
index 2cd2a51c00b3..000000000000
--- a/multimedia/libxine/files/patch-config.rpath
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.rpath.orig Thu Dec 7 01:15:04 2006
-+++ config.rpath Thu Dec 7 01:16:03 2006
-@@ -162,6 +162,9 @@
- ld_shlibs=no
- fi
- ;;
-+ freebsd*)
-+ hardcode_minus_L=yes
-+ ;;
- netbsd*)
- ;;
- solaris* | sysv5*)
diff --git a/multimedia/libxine/files/patch-misc_Makefile.in b/multimedia/libxine/files/patch-misc_Makefile.in
deleted file mode 100644
index 3e944eb6a577..000000000000
--- a/multimedia/libxine/files/patch-misc_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/Makefile.in.orig 2009-02-11 03:34:49.000000000 +0900
-+++ misc/Makefile.in 2009-02-22 09:05:26.000000000 +0900
-@@ -212,7 +212,7 @@
- JACK_LIBS = @JACK_LIBS@
- KSTAT_LIBS = @KSTAT_LIBS@
- LD = @LD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ @PTHREAD_LIBS@
- LDFLAGS_NOUNDEFINED = @LDFLAGS_NOUNDEFINED@
- LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
- LIBCDIO_LIBS = @LIBCDIO_LIBS@
diff --git a/multimedia/libxine/files/patch-misc_libxine.pc.in b/multimedia/libxine/files/patch-misc_libxine.pc.in
deleted file mode 100644
index 27331d82ac8d..000000000000
--- a/multimedia/libxine/files/patch-misc_libxine.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- misc/libxine.pc.in.orig
-+++ misc/libxine.pc.in
-@@ -22,7 +22,7 @@ Name: libxine
- Description: The xine engine library
- Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@@XINE_PATCH@
- Requires.private: @XDG_BASEDIR_REQUIRES@
--Libs: -L${libdir} -lxine
--Libs.private: @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
--Cflags: -I${includedir}
--Cflags.private: @PTHREAD_CFLAGS@
-+Libs: -L${libdir} -lxine @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
-+Libs.private:
-+Cflags: -I${includedir} @PTHREAD_CFLAGS@
-+Cflags.private:
diff --git a/multimedia/libxine/pkg-descr b/multimedia/libxine/pkg-descr
index f5aad59f1ff0..dc129cb46afc 100644
--- a/multimedia/libxine/pkg-descr
+++ b/multimedia/libxine/pkg-descr
@@ -5,4 +5,4 @@ of the most common multimedia formats available.
These are the libraries for the xine.
-WWW: http://www.xine-project.org
+WWW: http://www.xine-project.org
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 3df44a2a4486..fdf10f615a24 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -44,6 +44,7 @@ include/xine/xmlparser.h
lib/libxine.la
lib/libxine.so
lib/libxine.so.2
+lib/libxine.so.2.3.1
lib/libxine-interface.la
share/xine-lib/fonts/cetus-16.xinefont.gz
share/xine-lib/fonts/cetus-20.xinefont.gz