Date: Thu, 23 Aug 2012 16:37:51 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r303030 - in head/multimedia/handbrake: . files Message-ID: <201208231637.q7NGbpus059235@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Thu Aug 23 16:37:51 2012 New Revision: 303030 URL: http://svn.freebsd.org/changeset/ports/303030 Log: - Provide GUI (GTK+2 based) OPTION and default it to "on" - Pass maintainership to dmarion@ per his agreement - Adjust port description, bump port revision Approved by: dmarion (new maintainer) Added: head/multimedia/handbrake/files/patch-gtk_src_callbacks.c (contents, props changed) head/multimedia/handbrake/files/patch-make_include_main.defs (contents, props changed) Modified: head/multimedia/handbrake/Makefile head/multimedia/handbrake/pkg-descr Modified: head/multimedia/handbrake/Makefile ============================================================================== --- head/multimedia/handbrake/Makefile Thu Aug 23 16:24:09 2012 (r303029) +++ head/multimedia/handbrake/Makefile Thu Aug 23 16:37:51 2012 (r303030) @@ -7,6 +7,7 @@ PORTNAME= handbrake PORTVERSION= 0.9.8 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} \ http://download.handbrake.fr/handbrake/contrib/:contrib @@ -34,7 +35,7 @@ DISTFILES= HandBrake-${PORTVERSION}.tar. x264-r2146-bcd41db.tar.gz:contrib DIST_SUBDIR= ${PORTNAME} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= dmarion@FreeBSD.org COMMENT= Versatile DVD ripper and video transcoder LICENSE= GPLv2 @@ -46,11 +47,12 @@ USE_AUTOTOOLS= libtool aclocal LIBTOOLFILES= configure USE_GMAKE= yes USE_PYTHON_BUILD= yes +WANT_GNOME= yes WRKSRC= ${WRKDIR}/HandBrake-${PORTVERSION} PLIST_FILES= bin/HandBrakeCLI -CONFIGURE_ARGS= --force --disable-gtk +CONFIGURE_ARGS= --force CONFIGURE_TARGET= build BUILD_WRKSRC= ${WRKSRC}/build @@ -59,15 +61,31 @@ ALL_TARGET= # NOPRECIOUSMAKEVARS= yes # for ffmpeg and x264 +OPTIONS_DEFINE= GUI +GUI_DESC= Build GTK+2 based GUI program +OPTIONS_DEFAULT= GUI + .include <bsd.port.pre.mk> -# Recent binutils are required to handle inline SSSE3 asm (in x264) -.if ${OSVERSION} < 802509 || ${OSVERSION} >= 900000 && ${OSVERSION} < 900033 +# 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:MGUI} || ${OSVERSION} < 802509 || \ + ${OSVERSION} >= 900000 && ${OSVERSION} < 900033 BUILD_DEPENDS+= as:${PORTSDIR}/devel/binutils CONFIGURE_ENV= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV= COMPILER_PATH=${LOCALBASE}/bin .endif +.if ${PORT_OPTIONS:MGUI} +CONFIGURE_ARGS+= --disable-gtk-update-checks --disable-gst +LIB_DEPENDS+= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + notify:${PORTSDIR}/devel/libnotify +USE_GNOME= intltool +PLIST_FILES+= bin/HandBrake +.else +CONFIGURE_ARGS+= --disable-gtk +.endif + run-autotools-aclocal: @${DO_NADA} @@ -113,5 +131,8 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/HandBrakeCLI ${PREFIX}/bin +.if ${PORT_OPTIONS:MGUI} + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gtk/src/ghb ${PREFIX}/bin/HandBrake +.endif .include <bsd.port.post.mk> Added: head/multimedia/handbrake/files/patch-gtk_src_callbacks.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/handbrake/files/patch-gtk_src_callbacks.c Thu Aug 23 16:37:51 2012 (r303030) @@ -0,0 +1,10 @@ +--- ./gtk/src/callbacks.c.orig 2012-08-23 21:44:53.000000000 +0800 ++++ ./gtk/src/callbacks.c 2012-08-23 21:45:09.000000000 +0800 +@@ -34,6 +34,7 @@ + #include <dbus/dbus-glib.h> + #include <dbus/dbus-glib-lowlevel.h> + ++#include <sys/socket.h> + #include <netinet/in.h> + #include <netdb.h> + Added: head/multimedia/handbrake/files/patch-make_include_main.defs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/handbrake/files/patch-make_include_main.defs Thu Aug 23 16:37:51 2012 (r303030) @@ -0,0 +1,14 @@ +--- ./make/include/main.defs.orig 2012-06-09 05:45:19.000000000 +0800 ++++ ./make/include/main.defs 2012-08-23 16:08:07.000000000 +0800 +@@ -88,6 +88,11 @@ + MODULES += gtk + endif + ++ifeq (1-freebsd,$(FEATURE.gtk)-$(BUILD.system)) ++ ## build gtk when gtk+freebsd ++ MODULES += gtk ++endif ++ + ifeq (1,$(FEATURE.local_yasm)) + MODULES += contrib/yasm + endif Modified: head/multimedia/handbrake/pkg-descr ============================================================================== --- head/multimedia/handbrake/pkg-descr Thu Aug 23 16:24:09 2012 (r303029) +++ head/multimedia/handbrake/pkg-descr Thu Aug 23 16:37:51 2012 (r303030) @@ -1,5 +1,6 @@ HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video -transcoder with rich selection of features. +transcoder with rich selection of features. Both GUI and command-line only +versions are available. Supported sources: @@ -9,10 +10,10 @@ Supported sources: Outputs: - * File format: MP4 (M4V) and MKV + * File (container) format: MP4 (M4V) and MKV * Video: H.264 (x264), MPEG-2/MPEG-4 (ffmpeg), or Theora (libtheora) - * Audio: AAC, CoreAudio AAC/HE-AAC (OS X only), MP3, Flac, AC3, or Vorbis; - AC-3, DTS, DTS-HD, AAC, and MP3 pass-thru + * Audio: AAC, CoreAudio AAC/HE-AAC (OS X only), MP3, FLAC, AC3, or Vorbis; + AC-3, DTS, DTS-HD, AAC, and MP3 pass-through HandBrake also includes support for chapters, subtitles, advanced video filters, and more. It is also useful for making videos compatible with
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208231637.q7NGbpus059235>