Index: head/multimedia/vdr-plugin-xineliboutput/Makefile =================================================================== --- head/multimedia/vdr-plugin-xineliboutput/Makefile (revision 287152) +++ head/multimedia/vdr-plugin-xineliboutput/Makefile (revision 287153) @@ -1,63 +1,80 @@ # New ports collection makefile for: vdr-plugin-xineliboutput # Date created: Wed Apr 14 18:11:42 CEST 2010 # Whom: Juergen Lock # # $FreeBSD$ # PORTNAME= vdr-plugin-xineliboutput -PORTVERSION= 1.0.90s20110308.2305 -PORTREVISION= 11 +PORTVERSION= 1.0.90s20111129.1002 CATEGORIES= multimedia MASTER_SITES= SF:release \ LOCAL:snapshot MASTER_SITE_SUBDIR= xineliboutput/files/xineliboutput/vdr-xineliboutput-${PORTVERSION}/:release \ nox/:snapshot -DISTNAME= ${PORTNAME:S/-plugin-/-plugin-/}_${DISTVERSIONPREFIX}${DISTVERSION:S/s/+cvs/:S/$/.orig/}${DISTVERSIONSUFFIX} +DISTNAME= ${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION:S/s/+cvs/}${DISTVERSIONSUFFIX} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:snapshot MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - xineliboutput plugin/viewer -LIB_DEPENDS+= extractor.3:${PORTSDIR}/textproc/libextractor \ - xine.1:${PORTSDIR}/multimedia/libxine \ +LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine \ avutil.1:${PORTSDIR}/multimedia/ffmpeg \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ vdpau.1:${PORTSDIR}/multimedia/libvdpau +USE_BZIP2= yes PATCH_STRIP= -p1 USE_GNOME+= pkgconfig USE_XORG+= xrandr xrender USE_GL= gl glu glut PORTDOCS= COPYING README PORTEXAMPLES= xine MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/vdr-${PLUGIN} .include "${.CURDIR}/../vdr/Makefile.plugins" -MAKE_ARGS+= CONFIGURE_OPTS="${CONFIGURE_OPTS}" +# libbluray in ports is too old +# OPTIONS= LIBBLURAY "Enable libbluray support" on +OPTIONS= LIBEXTRACTOR "Enable libextractor support" off .include + +.if defined(WITH_LIBEXTRACTOR) +LIB_DEPENDS+= extractor.3:${PORTSDIR}/textproc/libextractor +CONFIGURE_OPTS+= --enable-libextractor +.else +CONFIGURE_OPTS+= --disable-libextractor +.endif + +.if defined(WITH_LIBBLURAY) +CONFIGURE_OPTS+= --enable-libbluray +LIB_DEPENDS+= bluray.0:${PORTSDIR}/multimedia/libbluray +.else +CONFIGURE_OPTS+= --disable-libbluray +.endif + +MAKE_ARGS+= CONFIGURE_OPTS="${CONFIGURE_OPTS}" post-patch: post-patch-plugin # clang doesn't know -MG ${TOUCH} -t 200001010000 ${WRKSRC}/nosignal_720x576.c \ ${WRKSRC}/black_720x576.c ${WRKSRC}/vdrlogo_720x576.c post-install: post-install-pluginlocales @${INSTALL} -o ${VDR_USER} -g ${VDR_GROUP} -d ${PREFIX}/etc/vdr/plugins/${PLUGIN} @${INSTALL_DATA} ${WRKSRC}/examples/allowed_hosts.conf ${PREFIX}/etc/vdr/plugins/${PLUGIN}/allowed_hosts.conf.sample @if [ ! -f ${PREFIX}/etc/vdr/plugins/${PLUGIN}/allowed_hosts.conf ]; then \ ${INSTALL_DATA} ${WRKSRC}/examples/allowed_hosts.conf ${PREFIX}/etc/vdr/plugins/${PLUGIN}; \ fi .if !defined(NOPORTEXAMPLES) ${MKDIR} ${EXAMPLESDIR}/xine ${INSTALL_DATA} ${FILESDIR}/keymap ${EXAMPLESDIR}/xine .endif .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) .endif .include Property changes on: head/multimedia/vdr-plugin-xineliboutput/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/multimedia/vdr-plugin-xineliboutput/distinfo =================================================================== --- head/multimedia/vdr-plugin-xineliboutput/distinfo (revision 287152) +++ head/multimedia/vdr-plugin-xineliboutput/distinfo (revision 287153) @@ -1,2 +1,2 @@ -SHA256 (vdr/vdr-plugin-xineliboutput_1.0.90+cvs20110308.2305.orig.tar.gz) = 9d5ae04c96cdebcd0f6eebc32242bfbfcbc5fa0d1c7aaf12cbebb5226a3a6a61 -SIZE (vdr/vdr-plugin-xineliboutput_1.0.90+cvs20110308.2305.orig.tar.gz) = 440599 +SHA256 (vdr/vdr-plugin-xineliboutput_1.0.90+cvs20111129.1002.tar.bz2) = ce659755ef526f333b565dde70b261c22ad604d59303d5a0c54666101b014d4c +SIZE (vdr/vdr-plugin-xineliboutput_1.0.90+cvs20111129.1002.tar.bz2) = 371781 Property changes on: head/multimedia/vdr-plugin-xineliboutput/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/multimedia/vdr-plugin-xineliboutput/files/patch-configure =================================================================== --- head/multimedia/vdr-plugin-xineliboutput/files/patch-configure (revision 287152) +++ head/multimedia/vdr-plugin-xineliboutput/files/patch-configure (revision 287153) @@ -1,62 +1,75 @@ --- a/configure +++ a/configure -@@ -348,10 +348,13 @@ test_pkgconfig +@@ -350,11 +350,14 @@ test_pkgconfig [ $debug = yes ] && \ test_library X11 do_error "none.h" "-lnolib" --test_library VDR libextractor "extractor.h" "-lextractor" "EXTRACTOR_getKeywords(0,0)" --test_library VDR libcap "sys/capability.h" "-lcap" "cap_get_proc()" --test_library XINE libxine "xine.h" "-lxine" "xine_init(0)" --test_library DLFCN dlfcn "dlfcn.h" "-ldl" "dlopen(0,0)" -+#test_library VDR libextractor "extractor.h" "-lextractor" "EXTRACTOR_getKeywords(0,0)" +-test_library VDR libextractor "extractor.h" "-lextractor" "EXTRACTOR_getKeywords(0,0)" +-test_library VDR libcap "sys/capability.h" "-lcap" "cap_get_proc()" +-test_library VDR libbluray "libbluray/bluray.h" "-lbluray" "bd_get_disc_info(0)" +-test_library XINE libxine "xine.h" "-lxine" "xine_init(0)" +-test_library DLFCN dlfcn "dlfcn.h" "-ldl" "dlopen(0,0)" ++#test_library VDR libextractor "extractor.h" "-lextractor" "EXTRACTOR_getKeywords(0,0)" +test_library VDR libextractor "extractor.h" "-lextractor" "EXTRACTOR_getKeywords(0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" -+#test_library VDR libcap "sys/capability.h" "-lcap" "cap_get_proc()" -+#test_library XINE libxine "xine.h" "-lxine" "xine_init(0)" -+test_library XINE libxine "xine.h" "-lxine" "xine_init(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" -+#test_library DLFCN dlfcn "dlfcn.h" "-ldl" "dlopen(0,0)" -+test_library DLFCN dlfcn "dlfcn.h" "" "dlopen(0,0)" ++#test_library VDR libcap "sys/capability.h" "-lcap" "cap_get_proc()" ++#test_library VDR libbluray "libbluray/bluray.h" "-lbluray" "bd_get_disc_info(0)" ++test_library VDR libbluray "libbluray/bluray.h" "-lbluray" "bd_get_disc_info(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" ++#test_library XINE libxine "xine.h" "-lxine" "xine_init(0)" ++test_library XINE libxine "xine.h" "-lxine" "xine_init(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" ++test_library DLFCN dlfcn "dlfcn.h" "" "dlopen(0,0)" if enabled libxine; then -@@ -363,19 +366,30 @@ if enabled libxine; then +@@ -366,24 +369,40 @@ if enabled libxine; then fi log " $XINEPLUGINDIR" - test_library AVUTIL libavutil "libavutil/mem.h" "-lavutil" "av_mallocz(1)" - test_library JPEG libjpeg "jpeglib.h" "-ljpeg" "jpeg_create_compress(0)" - test_library X11 x11 "X11/X.h" "-lX11" "XInitThreads()" +# test_library AVUTIL libavutil "libavutil/mem.h" "-lavutil" "av_mallocz(1)" + test_library AVUTIL libavutil "libavutil/mem.h" "-lavutil" "av_mallocz(1)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" +# test_library JPEG libjpeg "jpeglib.h" "-ljpeg" "jpeg_create_compress(0)" + test_library JPEG libjpeg "jpeglib.h" "-ljpeg" "jpeg_create_compress(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" +# test_library X11 x11 "X11/X.h" "-lX11" "XInitThreads()" + test_library X11 x11 "X11/X.h" "-lX11" "XInitThreads()" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" test_library PTHREAD pthread "pthread.h" "-lpthread" "pthread_create(0,0,0,0)" if enabled x11; then - test_library X11 xext "X11/extensions/Xext.h" "-lXext" "" - test_library X11 xshm "X11/extensions/XShm.h" "-lXext" "XShmQueryExtension(0)" - test_library X11 xrender "X11/extensions/Xrender.h" "-lXrender" "XRenderQueryFormats(0)" - test_library X11 xshape "X11/extensions/shape.h" "-lXext" "XShapeQueryExtension(0,0,0)" - test_library X11 xdpms "X11/extensions/dpms.h" "-lXext" "DPMSDisable(0)" - test_library X11 xinerama "X11/extensions/Xinerama.h" "-lXinerama" "XineramaQueryScreens(0,0)" - test_library X11 opengl "GL/glx.h" "-lGL -lGLU -lglut" "glXQueryVersion(0,0,0)" - test_library none vdpau "vdpau/vdpau_x11.h" "-lvdpau" "vdp_device_create_x11(0,0,0,0)" +# test_library X11 xext "X11/extensions/Xext.h" "-lXext" "" + test_library X11 xext "X11/extensions/Xext.h" "-lXext" "" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" +# test_library X11 xshm "X11/extensions/XShm.h" "-lXext" "XShmQueryExtension(0)" + test_library X11 xshm "X11/extensions/XShm.h" "-lXext" "XShmQueryExtension(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" +# test_library X11 xrender "X11/extensions/Xrender.h" "-lXrender" "XRenderQueryFormats(0)" + test_library X11 xrender "X11/extensions/Xrender.h" "-lXrender" "XRenderQueryFormats(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" +# test_library X11 xshape "X11/extensions/shape.h" "-lXext" "XShapeQueryExtension(0,0,0)" + test_library X11 xshape "X11/extensions/shape.h" "-lXext" "XShapeQueryExtension(0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" +# test_library X11 xdpms "X11/extensions/dpms.h" "-lXext" "DPMSDisable(0)" + test_library X11 xdpms "X11/extensions/dpms.h" "-lXext" "DPMSDisable(0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" +# test_library X11 xinerama "X11/extensions/Xinerama.h" "-lXinerama" "XineramaQueryScreens(0,0)" + test_library X11 xinerama "X11/extensions/Xinerama.h" "-lXinerama" "XineramaQueryScreens(0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" +# test_library X11 opengl "GL/glx.h" "-lGL -lGLU -lglut" "glXQueryVersion(0,0,0)" + test_library X11 opengl "GL/glx.h" "-lGL -lGLU -lglut" "glXQueryVersion(0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" +# test_library none vdpau "vdpau/vdpau_x11.h" "-lvdpau" "vdp_device_create_x11(0,0,0,0)" + test_library none vdpau "vdpau/vdpau_x11.h" "-lvdpau" "vdp_device_create_x11(0,0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib" ++# test_library X11 dbus-glib-1 \ ++# "dbus/dbus-glib.h" \ ++# "-ldbus-glib-1 -lgobject-2.0 -lglib-2.0" \ ++# "dbus_g_bus_get(0,0)" \ ++# "-I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include" test_library X11 dbus-glib-1 \ "dbus/dbus-glib.h" \ "-ldbus-glib-1 -lgobject-2.0 -lglib-2.0" \ + "dbus_g_bus_get(0,0)" \ +- "-I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include" ++ "-I/usr/include/dbus-1.0 -I${LOCALBASE}/include/dbus-1.0 -I/usr/include/glib-2.0 -I${LOCALBASE}/include/glib-2.0 -L${LOCALBASE}/lib" + fi + fi + Property changes on: head/multimedia/vdr-plugin-xineliboutput/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/multimedia/vdr-plugin-xineliboutput/files/patch-tools-sys_cap.h =================================================================== --- head/multimedia/vdr-plugin-xineliboutput/files/patch-tools-sys_cap.h (revision 287152) +++ head/multimedia/vdr-plugin-xineliboutput/files/patch-tools-sys_cap.h (revision 287153) @@ -1,12 +1,13 @@ --- a/tools/sys_cap.h +++ b/tools/sys_cap.h @@ -11,7 +11,9 @@ #ifndef _XINELIBOUTPUT_SYS_CAP_H_ #define _XINELIBOUTPUT_SYS_CAP_H_ +-#include "../features.h" +#ifdef HAVE_LIBCAP - #include "features.h" ++# include "../features.h" +#endif #include #include Property changes on: head/multimedia/vdr-plugin-xineliboutput/files/patch-tools-sys_cap.h ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property