From owner-svn-ports-all@freebsd.org Tue Dec 13 23:09:15 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6ED32C767E0; Tue, 13 Dec 2016 23:09:15 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3D68BA34; Tue, 13 Dec 2016 23:09:15 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBDN9ETO076492; Tue, 13 Dec 2016 23:09:14 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBDN9Duj076485; Tue, 13 Dec 2016 23:09:13 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201612132309.uBDN9Duj076485@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Tue, 13 Dec 2016 23:09:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428533 - in head/graphics/gnash: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Dec 2016 23:09:15 -0000 Author: dinoex Date: Tue Dec 13 23:09:13 2016 New Revision: 428533 URL: https://svnweb.freebsd.org/changeset/ports/428533 Log: - update to git version - use autoreconf - add missing direct dependecies - drop option ffmpeg0 - add more hardware acceleration Added: head/graphics/gnash/files/patch-Makefile.am (contents, props changed) head/graphics/gnash/files/patch-configure.ac (contents, props changed) head/graphics/gnash/files/patch-libbase_Makefile.am (contents, props changed) head/graphics/gnash/files/patch-libmedia_ffmpeg_VideoDecoderFfmpeg.cpp (contents, props changed) Deleted: head/graphics/gnash/files/ffmpeg0.patch head/graphics/gnash/files/patch-configure head/graphics/gnash/files/patch-libbase_GnashImageGif.cpp head/graphics/gnash/files/patch-libbase_GnashSleep.h head/graphics/gnash/files/patch-libbase_IOChannel.h head/graphics/gnash/files/patch-libbase_accumulator.h head/graphics/gnash/files/patch-libbase_rc.cpp head/graphics/gnash/files/patch-libcore_DragState.h head/graphics/gnash/files/patch-libcore_swf_DefineButtonTag.h head/graphics/gnash/files/patch-libmedia_FLVParser.cpp head/graphics/gnash/files/patch-plugin_npapi_plugin.cpp Modified: head/graphics/gnash/Makefile head/graphics/gnash/distinfo head/graphics/gnash/pkg-plist Modified: head/graphics/gnash/Makefile ============================================================================== --- head/graphics/gnash/Makefile Tue Dec 13 23:00:19 2016 (r428532) +++ head/graphics/gnash/Makefile Tue Dec 13 23:09:13 2016 (r428533) @@ -3,27 +3,32 @@ PORTNAME= gnash PORTVERSION= 0.8.10 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= graphics MASTER_SITES= GNU/${PORTNAME}/${PORTVERSION}/ +MASTER_SITES= http://git.savannah.gnu.org/cgit/gnash.git/snapshot/ +DISTNAME= gnash-2b3bdede0305c4fc3ad21a0a4197330606c9b880 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= dinoex@FreeBSD.org COMMENT= GNU Flash movie player LICENSE= GPLv3 -LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ - libltdl.so:devel/libltdl \ - libcurl.so:ftp/curl \ +LIB_DEPENDS= libltdl.so:devel/libltdl \ + libnspr4.so:devel/nspr \ + libc++.so.1:devel/libc++ \ libgif.so:graphics/giflib \ + libpng.so:graphics/png \ + libcurl.so:ftp/curl \ libspeex.so:audio/speex \ - libnspr4.so:devel/nspr + libspeexdsp.so:audio/speexdsp \ + libboost_thread.so:devel/boost-libs \ + libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig CONFLICTS= gnash-devel-[0-9]* -BROKEN= fails to build with Boost 1.62 - -USES= cpe tar:bzip2 pkgconfig gmake libtool jpeg +USES= cpe tar:bzip2 compiler:features autoreconf pkgconfig gmake libtool jpeg desktop-file-utils CPE_VENDOR= gnu GNU_CONFIGURE= yes WANT_GSTREAMER= yes @@ -33,25 +38,28 @@ INSTALLS_ICONS= yes SYSCONFIGDIR= ${PREFIX}/etc # jemalloc leads to infinite recursion on FreeBSD +CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \ --with-boost-lib="${LOCALBASE}/lib" \ - --disable-testsuite \ --with-plugins-install=prefix \ --sysconfdir="${SYSCONFIGDIR}" \ + --disable-testsuite \ --disable-kparts3 \ --disable-jemalloc -GNASHVER= ${PORTVERSION} +GNASHVER= 0.8.11dev CONFIG_FILES= gnashpluginrc gnashrc -WRKSRC= ${WRKDIR}/${PORTNAME}-${GNASHVER} +WRKSRC= ${WRKDIR}/${DISTNAME} PLIST_SUB+= GNASHVER="${GNASHVER}" USE_LDCONFIG= ${PREFIX}/lib/gnash OPTIONS_DEFINE= PLUGIN CYGNAL VAAPI DOCS OPTIONS_SINGLE= MEDIA GUI RENDERER -OPTIONS_SINGLE_MEDIA= FFMPEG FFMPEG2 GSTREAMER +OPTIONS_SINGLE_MEDIA= FFMPEG GSTREAMER OPTIONS_SINGLE_GUI= GTK2 KDE4 OPTIONS_SINGLE_RENDERER=AGG OPENGL CAIRO OPTIONS_DEFAULT=GTK2 PLUGIN AGG FFMPEG VAAPI @@ -61,10 +69,9 @@ OPTIONS_SUB= yes PLUGIN_DESC= browser plugin CYGNAL_DESC= Cygnal media server AGG_DESC= AGG renderer -OPENGL_DESC= OpenGL renderer -CAIRO_DESC= Cairo renderer (experimental) -FFMPEG_DESC= ffmpeg0 media handler -FFMPEG2_DESC= ffmpeg2 media handler (broken) +OPENGL_DESC= OpenGL renderer (experimental) +CAIRO_DESC= Cairo renderer +FFMPEG_DESC= ffmpeg media handler GSTREAMER_DESC= GStreamer media handler VAAPI_DESC= VAAPI support (requires FFMPEG) @@ -106,7 +113,8 @@ CONFIGURE_ARGS+= --disable-npapi .if ${PORT_OPTIONS:MKDE4} && ${PORT_OPTIONS:MPLUGIN} PLIST_SUB+= KPARTS4="${KDE_PREFIX}" -CONFIGURE_ARGS+= --with-kde4_prefix=${KDE_PREFIX} +CONFIGURE_ARGS+= --with-kde4_prefix=${KDE_PREFIX} \ + --with-kde-appsdatadir=${KDE_PREFIX}/share/apps/klash .else PLIST_SUB+= KPARTS4="@comment " CONFIGURE_ARGS+= --disable-kparts4 @@ -118,7 +126,7 @@ CONFIGURE_ARGS+= --disable-kparts4 GNASH_GUIS= .if ${PORT_OPTIONS:MGTK2} -USE_GNOME+= gtk20 atk gconf2 +USE_GNOME+= gtk20 pango atk gconf2 GNASH_GUIS+= gtk .endif @@ -127,7 +135,11 @@ GNASH_GUIS+= kde4 USE_QT4= moc_build QT_NONSTANDARD= yes USE_KDE= kdelibs +CONFIGURE_ARGS+= --without-gconf CONFIGURE_ENV+= KDE4_CONFIG="${KDE_PREFIX}/bin/kde4-config" +.if ${PORT_OPTIONS:MNLS} +LDFLAGS+= -lintl +.endif .endif .if ${GNASH_GUIS} == "" @@ -147,6 +159,7 @@ GNASH_RENDERERS+= agg .endif .if ${PORT_OPTIONS:MOPENGL} +IGNORE= support for OpenGL is currently broken, use option AGG USE_GL= yes GNASH_RENDERERS+= ogl .if ${PORT_OPTIONS:MGTK2} @@ -166,39 +179,33 @@ GNASH_RENDERERS+= cairo IGNORE= needs at least one renderer enabled. Please rerun 'make config' and enable AGG, OPENGL or CAIRO .endif -CONFIGURE_ARGS+= --enable-renderer=`${ECHO} ${GNASH_RENDERERS} | ${TR} ' ' ,` +CONFIGURE_ARGS+= --enable-renderer=${GNASH_RENDERERS:S/^ //W:S/ /,/gW} # # Hardware acceleration options processing # .if ${PORT_OPTIONS:MVAAPI} -.if empty(PORT_OPTIONS:MFFMPEG) && empty(PORT_OPTIONS:MFFMPEG2) +.if empty(PORT_OPTIONS:MFFMPEG) IGNORE= VAAPI currently works only with FFMPEG. Please rerun 'make config' and enable FFMPEG .endif LIB_DEPENDS+= libva.so:multimedia/libva +CONFIGURE_ARGS+= --enable-device=egl,x11,vaapi .else CONFIGURE_ARGS+= --enable-hwaccel=none # XVideo +CONFIGURE_ARGS+= --enable-device=egl,x11 .endif # # Media handler options processing # -.if ${PORT_OPTIONS:MFFMPEG2} && empty(PORT_OPTIONS:MFFMPEG) && empty(PORT_OPTIONS:MGSTREAMER) +.if ${PORT_OPTIONS:MFFMPEG} && empty(PORT_OPTIONS:MGSTREAMER) LIB_DEPENDS+= libavcodec.so:multimedia/ffmpeg CONFIGURE_ARGS+= --enable-media=ffmpeg \ --with-ffmpeg-incl=${LOCALBASE}/include/libavcodec \ --with-ffmpeg-lib=${LOCALBASE}/lib USE_SDL+= sdl MAKE_ARGS+= INCLUDES="-I${LOCALBASE}/include/ffmpeg" -.elif ${PORT_OPTIONS:MFFMPEG} && empty(PORT_OPTIONS:MFFMPEG2) && empty(PORT_OPTIONS:MGSTREAMER) -EXTRA_PATCHES+= ${FILESDIR}/ffmpeg0.patch -LIB_DEPENDS+= libavcodec0.so:multimedia/ffmpeg0 -CONFIGURE_ARGS+= --enable-media=ffmpeg \ - --with-ffmpeg-incl=${LOCALBASE}/include/ffmpeg0/libavcodec \ - --with-ffmpeg-lib=${LOCALBASE}/lib/ffmpeg0 -USE_SDL+= sdl -MAKE_ARGS+= INCLUDES="-I${LOCALBASE}/include/ffmpeg0" -.elif ${PORT_OPTIONS:MGSTREAMER} && empty(PORT_OPTIONS:MFFMPEG) && empty(PORT_OPTIONS:MFFMPEG2) +.elif ${PORT_OPTIONS:MGSTREAMER} && empty(PORT_OPTIONS:MFFMPEG) USE_GSTREAMER= yes CONFIGURE_ARGS+= --enable-media=gst USE_SDL+= sdl @@ -209,22 +216,14 @@ IGNORE= can't be built with multiple m .include -pre-everything:: -.if ${PORT_OPTIONS:MOPENGL} - @${ECHO_CMD} "OpenGL support is currently broken (Gnash hangs using 100% CPU). Use at your own risk" - @sleep 3 -.endif - post-patch: - ${REINPLACE_CMD} -e '/KDE4_APPSDATADIR=/ s|share/kde4|share|' \ - -e 's|/usr/local|${LOCALBASE}|g; \ - s|/lib64|/lib|g; \ - s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure \ - ${WRKSRC}/macros/libslist ${WRKSRC}/macros/incllist - ${REINPLACE_CMD} -e '/^pkgconfigdir =/ s|libdir)|exec_prefix)/libdata|' \ - ${WRKSRC}/Makefile.in - ${REINPLACE_CMD} -e '/^man1dir =/ s|=.*|= ${MAN1PREFIX}/man/man1|' \ - ${WRKSRC}/doc/C/Makefile.in + ${REINPLACE_CMD} -e 's|lib64|lib|g' -e 's|lib32|lib|g' \ + ${WRKSRC}/macros/libslist + ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ + -e 's|/usr/X11R6|${LOCALBASE}|g' \ + ${WRKSRC}/macros/incllist + ${REINPLACE_CMD} -e 's|CODEC_ID_|AV_CODEC_ID_|' \ + ${WRKSRC}/libmedia/ffmpeg/VideoDecoderFfmpegVaapi.cpp post-install: .for conf in ${CONFIG_FILES} Modified: head/graphics/gnash/distinfo ============================================================================== --- head/graphics/gnash/distinfo Tue Dec 13 23:00:19 2016 (r428532) +++ head/graphics/gnash/distinfo Tue Dec 13 23:09:13 2016 (r428533) @@ -1,2 +1,3 @@ -SHA256 (gnash-0.8.10.tar.bz2) = 9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224 -SIZE (gnash-0.8.10.tar.bz2) = 4238106 +TIMESTAMP = 1481612892 +SHA256 (gnash-2b3bdede0305c4fc3ad21a0a4197330606c9b880.tar.bz2) = 9a88a623ccb4adab0381d4f97afe3019bab95855dd58685709b7a968fd91bb1d +SIZE (gnash-2b3bdede0305c4fc3ad21a0a4197330606c9b880.tar.bz2) = 4856961 Added: head/graphics/gnash/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gnash/files/patch-Makefile.am Tue Dec 13 23:09:13 2016 (r428533) @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2016-07-21 14:25:09.000000000 +0200 ++++ Makefile.am 2016-12-13 10:23:36.939767000 +0100 +@@ -512,7 +512,7 @@ + apidoc: + $(MAKE) -C doc $@ + +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(exec_prefix)/libdata/pkgconfig + pkgconfig_DATA = \ + gnash.pc \ + $(NULL) Added: head/graphics/gnash/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gnash/files/patch-configure.ac Tue Dec 13 23:09:13 2016 (r428533) @@ -0,0 +1,20 @@ +--- configure.ac.orig 2016-07-21 14:25:09.000000000 +0200 ++++ configure.ac 2016-12-13 08:41:26.852652000 +0100 +@@ -4144,7 +4144,7 @@ + fi + echo " SSL libs are: $SSL_LIBS" + else +- PKG_ERR([No SSL development package is installed, but it's enabled."]) ++ PKG_ERR([No SSL development package is installed, but it's enabled.]) + fi + fi + +@@ -4157,7 +4157,7 @@ + fi + echo " SSH libs are: $SSH_LIBS" + else +- PKG_ERR([No SSH development package is installed, but it's enabled."]) ++ PKG_ERR([No SSH development package is installed, but it's enabled.]) + fi + fi + Added: head/graphics/gnash/files/patch-libbase_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gnash/files/patch-libbase_Makefile.am Tue Dec 13 23:09:13 2016 (r428533) @@ -0,0 +1,25 @@ +--- libbase/Makefile.am.orig 2016-07-21 14:25:09.000000000 +0200 ++++ libbase/Makefile.am 2016-12-13 22:20:48.980088000 +0100 +@@ -135,6 +135,7 @@ + endif + + if HAVE_VAAPI ++if HAVE_VAAPI_GLX + libgnashbase_la_SOURCES += \ + GnashVaapiImage.cpp \ + GnashVaapiImage.h \ +@@ -143,6 +144,14 @@ + GnashVaapiTexture.h \ + $(NULL) + ++else ++libgnashbase_la_SOURCES += \ ++ GnashVaapiImage.cpp \ ++ GnashVaapiImage.h \ ++ GnashVaapiImageProxy.h \ ++ $(NULL) ++ ++endif + endif + + Added: head/graphics/gnash/files/patch-libmedia_ffmpeg_VideoDecoderFfmpeg.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gnash/files/patch-libmedia_ffmpeg_VideoDecoderFfmpeg.cpp Tue Dec 13 23:09:13 2016 (r428533) @@ -0,0 +1,12 @@ +--- libmedia/ffmpeg/VideoDecoderFfmpeg.cpp.orig 2016-07-21 14:25:09.000000000 +0200 ++++ libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 2016-12-13 21:47:28.602555000 +0100 +@@ -544,7 +544,9 @@ + vaapi_set_surface(pic, surface); + + static unsigned int pic_num = 0; ++#if LIBAVCODEC_VERSION_MAJOR < 57 + pic->type = FF_BUFFER_TYPE_USER; ++#endif + #if LIBAVCODEC_VERSION_MAJOR < 54 + // This field has been unused for longer but has been removed with + // libavcodec 54. Modified: head/graphics/gnash/pkg-plist ============================================================================== --- head/graphics/gnash/pkg-plist Tue Dec 13 23:00:19 2016 (r428532) +++ head/graphics/gnash/pkg-plist Tue Dec 13 23:09:13 2016 (r428533) @@ -1,9 +1,10 @@ +bin/eglinfo bin/gnash %%GTK2%%bin/gnash-gtk-launcher %%GTK2%%bin/gtk-gnash %%KDE4%%bin/gnash-qt-launcher -%%KDE4%%bin/kde4-gnash bin/gprocessor +%%KDE4%%bin/qt4-gnash bin/rtmpget %%GSTREAMER%%bin/findmicrophones %%GSTREAMER%%bin/findwebcams @@ -151,24 +152,18 @@ include/gnash/asobj/movie_root.h include/gnash/asobj/namedStrings.h include/gnash/display_pkg.h include/gnash/dsodefs.h -include/gnash/extension.h include/gnash/external_pkg.h include/gnash/filters_pkg.h include/gnash/geom_pkg.h include/gnash/getclocktime.hpp include/gnash/gettext.h include/gnash/gmemory.h -include/gnash/jemalloc.h -include/gnash/jemalloc_gnash.h -include/gnash/jemalloc_rb.h -include/gnash/jemalloc_types.h include/gnash/log.h include/gnash/net_pkg.h include/gnash/noseek_fd_adapter.h include/gnash/parser/movie_definition.h include/gnash/rc.h include/gnash/ref_counted.h -include/gnash/sharedlib.h include/gnash/snappingrange.h include/gnash/string_table.h include/gnash/text_pkg.h @@ -206,6 +201,8 @@ lib/gnash/libgnashrender-%%GNASHVER%%.so lib/gnash/libgnashrender.so lib/gnash/libgnashsound-%%GNASHVER%%.so lib/gnash/libgnashsound.so +%%VAAPI%%lib/gnash/libgnashvaapi-%%GNASHVER%%.so +%%VAAPI%%lib/gnash/libgnashvaapi.so libdata/pkgconfig/gnash.pc %%GTK2%%share/applications/gnash.desktop %%KDE4%%share/applications/klash.desktop @@ -220,7 +217,7 @@ man/man1/soldumper.1.gz %%GTK2%%man/man1/gnash-gtk-launcher.1.gz %%GTK2%%man/man1/gtk-gnash.1.gz %%KDE4%%man/man1/gnash-qt-launcher.1.gz -%%KDE4%%man/man1/kde4-gnash.1.gz +%%KDE4%%man/man1/qt4-gnash.1.gz %%DATADIR%%/GnashG.png %%DATADIR%%/gnash-splash.swf %%DATADIR%%/gnash_128_96.ico @@ -240,6 +237,8 @@ share/locale/fr/LC_MESSAGES/gnash.mo share/locale/it/LC_MESSAGES/gnash.mo share/locale/ja/LC_MESSAGES/gnash.mo share/locale/km/LC_MESSAGES/gnash.mo +share/locale/nb/LC_MESSAGES/gnash.mo share/locale/ne/LC_MESSAGES/gnash.mo share/locale/ru/LC_MESSAGES/gnash.mo +share/locale/zh_CN/LC_MESSAGES/gnash.mo share/locale/zh_TW/LC_MESSAGES/gnash.mo