Still doesn't seem to work as well as opera...
Brandon
On Fri, Jun 27, 2008 at 3:11 PM, Aaron Stellman <[EMAIL PROTECTED]> wrote:
> On Fri, Jun 27, 2008 at 12:45:03PM +0000, Deanna Phillips wrote:
>> Aaron Stellman writes:
>>
>> > On Thu, Jun 26, 2008 at 01:27:27PM +0000, Deanna Phillips wrote:
>> >> guilherme m. schroeder writes:
>> >>
>> >> > Worked fine here (OpenBSD-current/amd64). Just needed to
>> >> > change the int64_t to gint64 that i sent to you.
>> >>
>> >> Thanks!
>> >>
>> >> If you sent me a patch, I didn't receive it. Please try
>> >> again or post it here.
>> >>
>> > yea, it doesn't build on OpenBSD-current/amd64, related to the
>> > issue reported above.
>>
>> Here is a new diff with guilherme's amd64 fix.
>>
> It's all good now. Youtube plays reasonably well, it does take several
> seconds for sound and video to sync at the beginning of the video. Also,
> the quality of the video isn't as good as the adobe linux blob, but
> can't complain.
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/www/gnash/Makefile,v
>> retrieving revision 1.19
>> diff -u -p -r1.19 Makefile
>> --- Makefile 18 Dec 2007 22:04:32 -0000 1.19
>> +++ Makefile 27 Jun 2008 12:12:22 -0000
>> @@ -2,82 +2,74 @@
>> SHARED_ONLY= Yes
>>
>> COMMENT= flash player with firefox browser plugin
>> -DISTNAME= gnash-0.8.0
>> -PKGNAME= ${DISTNAME}p3
>> -SHARED_LIBS += gnashbase 2.0
>> -SHARED_LIBS += gnashgeo 2.0
>> -SHARED_LIBS += gnashamf 2.0
>> -SHARED_LIBS += gnashserver 2.0
>> -SHARED_LIBS += gnashbackend 2.0
>> -SHARED_LIBS += gnashgui 2.0
>> -SHARED_LIBS += gnashplayer 2.0
>> +
>> +VER= 0.8.3
>> +DISTNAME= gnash-${VER}
>>
>> CATEGORIES= www
>> -MASTER_SITES= ${MASTER_SITE_GNU:=/gnash/0.8.0/}
>> +MASTER_SITES= http://getgnash.org/packages/releases/
>>
>> -HOMEPAGE= http://gnash.lulu.com
>> +HOMEPAGE= http://gnashdev.org
>>
>> MAINTAINER= Deanna Phillips <[EMAIL PROTECTED]>
>>
>> -# patented codecs
>> -PERMIT_PACKAGE_CDROM= No
>> +# GPLv3
>> +PERMIT_PACKAGE_CDROM= Yes
>> PERMIT_PACKAGE_FTP= Yes
>> PERMIT_DISTFILES_CDROM= Yes
>> PERMIT_DISTFILES_FTP= Yes
>>
>> -LIBTOOL_FLAGS+= --tag=disable-static
>> -MODULES= devel/gettext
>> -NO_REGRESS= testsuite available at http://www.gnashdev.org/testcases/
>> -USE_GMAKE= Yes
>> -USE_LIBTOOL= Yes
>> -USE_X11= Yes
>> -
>> -BUILD_DEPENDS+= ::devel/boost
>> +WANTLIB= c crypto expat freetype fontconfig \
>> + glib-2.0 gobject-2.0 gthread-2.0 gmodule-2.0\
>> + idn pcre jpeg m pthread ssl stdc++ z \
>> + gstbase-0.10 gstreamer-0.10
>>
>> +MODULES= devel/gettext
>>
>> LIB_DEPENDS+= curl.>=5::net/curl \
>> xml2.>=9.0::textproc/libxml \
>> - theora.>=2::multimedia/libtheora \
>> agg.>=2::graphics/agg \
>> gdk_pixbuf-2.0,gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 \
>> - boost_thread-mt,boost_date_time::devel/boost \
>> +
>> boost_thread-mt.>=1,boost_date_time-mt.>=1:boost->=1.34.1p2:devel/boost \
>> ltdl::devel/libtool,-ltdl \
>> - SDL.>=7::devel/sdl \
>> - vorbis,vorbisenc::audio/libvorbis \
>> - avcodec.>=9,avutil.>=2,avformat.>=9::graphics/ffmpeg
>> -
>> -WANTLIB= Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr expat \
>> - freetype fontconfig Xrender usbhid Xext X11 ICE SM \
>> - stdc++ m pthread c ssl crypto z ogg cairo \
>> - glib-2.0 pango-1.0 pangoft2-1.0 pangocairo-1.0 pangox-1.0 \
>> - gobject-2.0 gmodule-2.0 atk-1.0 png jpeg glitz idn
>> -
>> -CONFIGURE_STYLE=gnu
>> -
>> -.for dir in libamf backend libbase libgeometry gui server
>> - LINKDIRS+=-L${WRKSRC}/${dir}/.libs
>> -.endfor
>> + gstpbutils-0.10::multimedia/gstreamer-0.10/plugins-base
>>
>> -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
>> - LDFLAGS="${LINKDIRS} \
>> - -L${LOCALBASE}/lib"
>> +RUN_DEPENDS+=
>> :gst-ffmpeg->=0.10.4:multimedia/gstreamer-0.10/plugins-ffmpeg \
>> + :gstreamer-mad-*:multimedia/gstreamer-0.10/plugins-ugly,-mad \
>> + ::multimedia/gstreamer-0.10/plugins-bad \
>> +
>> :gstreamer-plugins-good->=0.10.8p3:multimedia/gstreamer-0.10/plugins-good \
>> +
>> :gstreamer-confelements-*:multimedia/gstreamer-0.10/plugins-good,-gconf \
>> +
>> :gstreamer-gnome->=0.10.19p1:multimedia/gstreamer-0.10/plugins-base,-gnome
>>
>> -CONFIGURE_ARGS+=--enable-media=ffmpeg \
>> - --with-plugindir=${LOCALBASE}/lib/mozilla-plugins \
>> - --disable-klash \
>> +USE_X11= Yes
>> +USE_GMAKE= Yes
>> +USE_LIBTOOL= Yes
>> +LIBTOOL_FLAGS+= --tag=disable-static
>> +
>> +CONFIGURE_STYLE= gnu
>> +
>> +post-install:
>> + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnash
>> + ${INSTALL_DATA} ${WRKSRC}/libbase/{gnashpluginrc,gnashrc} \
>> + ${PREFIX}/share/examples/gnash
>> +
>> +CONFIGURE_ARGS+=--with-npapi-plugindir=${LOCALBASE}/lib/mozilla-plugins \
>> --disable-cygnal \
>> --disable-debugger \
>> --enable-renderer=agg \
>> --enable-gui=gtk \
>> - --without-gcc-arch \
>> --with-libintl-prefix=${LOCALBASE}
>>
>> -MAKE_FLAGS+= libgnashbase_la_LDFLAGS= \
>> - libgnashgeo_la_LDFLAGS= \
>> - libgnashamf_la_LDFLAGS= \
>> - libgnashserver_la_LDFLAGS= \
>> - libgnashbackend_la_LDFLAGS= \
>> - libgnashgui_la_LDFLAGS= \
>> - libgnashplayer_la_LDFLAGS=
>> +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
>> + LDFLAGS="-L${LOCALBASE}/lib"
>> +
>> +INSTALL_TARGET= install install-plugins
>> +
>> +NO_REGRESS= testsuite available at http://www.gnashdev.org/testcases/
>> +
>> +SHARED_LIBS= gnashnet 0.0 \
>> + mozsdk 0.0
>> +
>> +SUBST_VARS= VER
>>
>> .include <bsd.port.mk>
>> Index: distinfo
>> ===================================================================
>> RCS file: /cvs/ports/www/gnash/distinfo,v
>> retrieving revision 1.4
>> diff -u -p -r1.4 distinfo
>> --- distinfo 7 Jul 2007 10:47:04 -0000 1.4
>> +++ distinfo 25 Jun 2008 00:08:54 -0000
>> @@ -1,5 +1,5 @@
>> -MD5 (gnash-0.8.0.tar.gz) = AvcI2tx839juJY4Ix8Dqyw==
>> -RMD160 (gnash-0.8.0.tar.gz) = BTFLYbkZD/QsmJqhZu39A+I7d8w=
>> -SHA1 (gnash-0.8.0.tar.gz) = KainhCElctnX+nw+76RKOxutN2g=
>> -SHA256 (gnash-0.8.0.tar.gz) = bIPPXiIFzBjqHaJx3LzOvBtTyqWZZLwW0opy6XjlgLQ=
>> -SIZE (gnash-0.8.0.tar.gz) = 2706203
>> +MD5 (gnash-0.8.3.tar.gz) = Emvoezhmq916nqMvy0Q2Pg==
>> +RMD160 (gnash-0.8.3.tar.gz) = rR/1kwmTFGF0WeUtiK7SI0jmHjI=
>> +SHA1 (gnash-0.8.3.tar.gz) = yaqdr0TKClcjSyOVJfVRtj1ZedA=
>> +SHA256 (gnash-0.8.3.tar.gz) = dDAQrTkjJL6r5BiGkKuIPtVsYL6nKXjT8hDqnHMWqFM=
>> +SIZE (gnash-0.8.3.tar.gz) = 4002062
>> Index: patches/patch-backend_sound_handler_sdl_h
>> ===================================================================
>> RCS file: patches/patch-backend_sound_handler_sdl_h
>> diff -N patches/patch-backend_sound_handler_sdl_h
>> --- patches/patch-backend_sound_handler_sdl_h 24 Sep 2007 07:46:38 -0000
>> 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,13 +0,0 @@
>> -$OpenBSD: patch-backend_sound_handler_sdl_h,v 1.1 2007/09/24 07:46:38
>> jakemsr Exp $
>> ---- backend/sound_handler_sdl.h.orig Mon Sep 10 23:37:55 2007
>> -+++ backend/sound_handler_sdl.h Mon Sep 10 23:38:48 2007
>> -@@ -26,7 +26,9 @@
>> - #include "log.h"
>> -
>> - #ifdef USE_FFMPEG
>> -+extern "C" {
>> - #include <ffmpeg/avcodec.h>
>> -+}
>> - #elif defined(USE_MAD)
>> - #include <mad.h>
>> - #endif
>> Index: patches/patch-configure
>> ===================================================================
>> RCS file: /cvs/ports/www/gnash/patches/patch-configure,v
>> retrieving revision 1.2
>> diff -u -p -r1.2 patch-configure
>> --- patches/patch-configure 9 Aug 2007 22:08:19 -0000 1.2
>> +++ patches/patch-configure 14 Jun 2008 20:45:30 -0000
>> @@ -1,50 +1,16 @@
>> -$OpenBSD: patch-configure,v 1.2 2007/08/09 22:08:19 deanna Exp $
>> ---- configure.orig Fri Jun 8 21:41:56 2007
>> -+++ configure Thu Aug 9 14:33:08 2007
>> -@@ -5271,7 +5271,7 @@ _ACEOF
>> -
>> -
>> -
>> -- INTLLIBS="$LIBINTL"
>> -+ INTLLIBS="$LTLIBINTL"
>> -
>> -
>> -
>> -@@ -25566,14 +25566,9 @@ echo "${ECHO_T}${libtheora}" >&6
>> -
>> - echo "$as_me:$LINENO: checking for libgsm library" >&5
>> - echo $ECHO_N "checking for libgsm library... $ECHO_C" >&6
>> -- if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
>> -- $PKG_CONFIG --exists gsm && libgsm=`$PKG_CONFIG --libs gsm`
>> -- else
>> - libgsm=""
>> -- fi
>> - if test x"${libgsm}" = x; then
>> - if test -f ${topdir}/libgsm.a -o -f ${topdir}/libgsm.${shlibext};
>> then
>> -- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"
>> - echo "$as_me:$LINENO: result: ${topdir}/libgsm" >&5
>> - echo "${ECHO_T}${topdir}/libgsm" >&6
>> - else
>> -@@ -25644,9 +25639,6 @@ LIBS=$ac_check_lib_save_LIBS
>> - fi
>> - echo "$as_me:$LINENO: result: $ac_cv_lib_gsm_gsm_destroy" >&5
>> - echo "${ECHO_T}$ac_cv_lib_gsm_gsm_destroy" >&6
>> --if test $ac_cv_lib_gsm_gsm_destroy = yes; then
>> -- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"
>> --fi
>> -
>> - fi
>> - fi
>> -@@ -50341,10 +50333,10 @@ s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
>> - s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
>> - s,@EGREP@,$EGREP,;t t
>> - s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
>> --s,@LIBICONV@,$LIBICONV,;t t
>> -+s,@LIBICONV@,$LTLIBICONV,;t t
>> - s,@LTLIBICONV@,$LTLIBICONV,;t t
>> - s,@INTLLIBS@,$INTLLIBS,;t t
>> --s,@LIBINTL@,$LIBINTL,;t t
>> -+s,@LIBINTL@,$LTLIBINTL,;t t
>> - s,@LTLIBINTL@,$LTLIBINTL,;t t
>> - s,@POSUB@,$POSUB,;t t
>> - s,@HAS_GETTEXT_TRUE@,$HAS_GETTEXT_TRUE,;t t
>> +$OpenBSD$
>> +--- configure.orig Fri Jun 13 12:35:20 2008
>> ++++ configure Fri Jun 13 12:38:34 2008
>> +@@ -56827,10 +56827,10 @@ CONFIG_RPATH!$CONFIG_RPATH$ac_delim
>> + GREP!$GREP$ac_delim
>> + EGREP!$EGREP$ac_delim
>> + INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
>> +-LIBICONV!$LIBICONV$ac_delim
>> ++LIBICONV!$LTLIBICONV$ac_delim
>> + LTLIBICONV!$LTLIBICONV$ac_delim
>> + INTLLIBS!$INTLLIBS$ac_delim
>> +-LIBINTL!$LIBINTL$ac_delim
>> ++LIBINTL!$LTLIBINTL$ac_delim
>> + LTLIBINTL!$LTLIBINTL$ac_delim
>> + POSUB!$POSUB$ac_delim
>> + HAS_GETTEXT_TRUE!$HAS_GETTEXT_TRUE$ac_delim
>> Index: patches/patch-gui_gtk_cpp
>> ===================================================================
>> RCS file: patches/patch-gui_gtk_cpp
>> diff -N patches/patch-gui_gtk_cpp
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-gui_gtk_cpp 21 Jun 2008 23:05:10 -0000
>> @@ -0,0 +1,19 @@
>> +$OpenBSD$
>> +--- gui/gtk.cpp.orig Sat Jun 21 19:04:24 2008
>> ++++ gui/gtk.cpp Sat Jun 21 19:05:06 2008
>> +@@ -2098,6 +2098,7 @@ GtkGui::createControlMenu(GtkWidget *obj)
>> + gtk_widget_show (separator1);
>> + gtk_container_add (GTK_CONTAINER (menu), separator1);
>> +
>> ++#if 0 // Presently disabled, see gnash bug #23612
>> + // Restart
>> + //
>> + GtkImageMenuItem *menuitem_restart =
>> +@@ -2108,6 +2109,7 @@ GtkGui::createControlMenu(GtkWidget *obj)
>> + gtk_widget_show(GTK_WIDGET(menuitem_restart));
>> + g_signal_connect ((gpointer) menuitem_restart, "activate",
>> + G_CALLBACK (&menuitem_restart_callback), this);
>> ++#endif
>> +
>> + #if 0 // Presently disabled
>> +
>> Index: patches/patch-libbase_Makefile_in
>> ===================================================================
>> RCS file: patches/patch-libbase_Makefile_in
>> diff -N patches/patch-libbase_Makefile_in
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-libbase_Makefile_in 13 Jun 2008 16:14:42 -0000
>> @@ -0,0 +1,18 @@
>> +$OpenBSD$
>> +--- libbase/Makefile.in.orig Fri Jun 13 12:12:59 2008
>> ++++ libbase/Makefile.in Fri Jun 13 12:14:16 2008
>> +@@ -948,14 +948,6 @@ mostlyclean-libtool:
>> + clean-libtool:
>> + -rm -rf .libs _libs
>> + install-sysconfDATA: $(sysconf_DATA)
>> +- @$(NORMAL_INSTALL)
>> +- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
>> +- @list='$(sysconf_DATA)'; for p in $$list; do \
>> +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>> +- f=$(am__strip_dir) \
>> +- echo " $(sysconfDATA_INSTALL) '$$d$$p'
>> '$(DESTDIR)$(sysconfdir)/$$f'"; \
>> +- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
>> +- done
>> +
>> + uninstall-sysconfDATA:
>> + @$(NORMAL_UNINSTALL)
>> Index: patches/patch-libbase_embedVideoDecoderFfmpeg_cpp
>> ===================================================================
>> RCS file: patches/patch-libbase_embedVideoDecoderFfmpeg_cpp
>> diff -N patches/patch-libbase_embedVideoDecoderFfmpeg_cpp
>> --- patches/patch-libbase_embedVideoDecoderFfmpeg_cpp 24 Sep 2007 07:46:38
>> -0000 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,13 +0,0 @@
>> -$OpenBSD: patch-libbase_embedVideoDecoderFfmpeg_cpp,v 1.1 2007/09/24
>> 07:46:38 jakemsr Exp $
>> ---- libbase/embedVideoDecoderFfmpeg.cpp.orig Mon Sep 10 23:41:46 2007
>> -+++ libbase/embedVideoDecoderFfmpeg.cpp Mon Sep 10 23:42:14 2007
>> -@@ -26,7 +26,9 @@
>> - #include "embedVideoDecoderFfmpeg.h"
>> -
>> - #ifdef HAVE_SWSCALE_H
>> -+extern "C" {
>> - #include <ffmpeg/swscale.h>
>> -+}
>> - #endif
>> -
>> - #include <boost/scoped_array.hpp>
>> Index: patches/patch-libbase_embedVideoDecoderFfmpeg_h
>> ===================================================================
>> RCS file: patches/patch-libbase_embedVideoDecoderFfmpeg_h
>> diff -N patches/patch-libbase_embedVideoDecoderFfmpeg_h
>> --- patches/patch-libbase_embedVideoDecoderFfmpeg_h 24 Sep 2007 07:46:38
>> -0000 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,13 +0,0 @@
>> -$OpenBSD: patch-libbase_embedVideoDecoderFfmpeg_h,v 1.1 2007/09/24 07:46:38
>> jakemsr Exp $
>> ---- libbase/embedVideoDecoderFfmpeg.h.orig Mon Sep 10 23:41:09 2007
>> -+++ libbase/embedVideoDecoderFfmpeg.h Mon Sep 10 23:41:29 2007
>> -@@ -28,7 +28,9 @@
>> -
>> - #include <vector>
>> - #include "embedVideoDecoder.h"
>> -+extern "C" {
>> - #include <ffmpeg/avcodec.h>
>> -+}
>> - #include "image.h"
>> -
>> - namespace gnash {
>> Index: patches/patch-libbase_rc_cpp
>> ===================================================================
>> RCS file: patches/patch-libbase_rc_cpp
>> diff -N patches/patch-libbase_rc_cpp
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-libbase_rc_cpp 4 Jun 2008 01:33:22 -0000
>> @@ -0,0 +1,11 @@
>> +$OpenBSD$
>> +--- libbase/rc.cpp.orig Tue Jun 3 17:34:10 2008
>> ++++ libbase/rc.cpp Tue Jun 3 17:35:48 2008
>> +@@ -128,6 +128,7 @@ RcInitFile::loadFiles()
>> +
>> + // Check the default system location
>> + std::string loadfile = SYSCONFDIR;
>> ++ loadfile.append("/gnash");
>> + loadfile.append("/gnashrc");
>> + parseFile(loadfile);
>> +
>> Index: patches/patch-plugin_plugin_cpp
>> ===================================================================
>> RCS file: patches/patch-plugin_plugin_cpp
>> diff -N patches/patch-plugin_plugin_cpp
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-plugin_plugin_cpp 4 Jun 2008 01:33:43 -0000
>> @@ -0,0 +1,11 @@
>> +$OpenBSD$
>> +--- plugin/plugin.cpp.orig Tue Jun 3 17:36:08 2008
>> ++++ plugin/plugin.cpp Tue Jun 3 17:36:46 2008
>> +@@ -200,6 +200,7 @@ NS_PluginInitialize()
>> + }
>> +
>> + newGnashRc.append(SYSCONFDIR);
>> ++ newGnashRc.append("/gnash");
>> + newGnashRc.append("/gnashpluginrc");
>> +
>> + char *home = getenv("HOME");
>> Index: patches/patch-po_Makefile_in
>> ===================================================================
>> RCS file: patches/patch-po_Makefile_in
>> diff -N patches/patch-po_Makefile_in
>> --- patches/patch-po_Makefile_in 7 Jul 2007 10:47:04 -0000 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,15 +0,0 @@
>> -$OpenBSD: patch-po_Makefile_in,v 1.1 2007/07/07 10:47:04 deanna Exp $
>> ---- po/Makefile.in.orig Fri Jul 6 09:30:11 2007
>> -+++ po/Makefile.in Fri Jul 6 09:30:31 2007
>> -@@ -636,9 +636,9 @@ force:
>> - # install-hook: rename the es.gmo files to gnash.mo at installtion time
>> - install-data-hook: $(gmofiles)
>> - @for i in $(translations); do \
>> -- $(mkinstalldirs) "$(DESTDIR)$(datadir)/locale/$$i"; \
>> -+ $(mkinstalldirs) "$(DESTDIR)$(datadir)/locale/$$i/LC_MESSAGES"; \
>> - if test -f $$i.gmo; then \
>> -- $(INSTALL_DATA) $$i.gmo $(DESTDIR)$(datadir)/locale/$$i/gnash.mo; \
>> -+ $(INSTALL_DATA) $$i.gmo
>> $(DESTDIR)$(datadir)/locale/$$i/LC_MESSAGES/gnash.mo; \
>> - fi; \
>> - done
>> - # Tell versions [3.59,3.63) of GNU make to not export all variables.
>> Index: patches/patch-server_asobj_NetStreamFfmpeg_h
>> ===================================================================
>> RCS file: patches/patch-server_asobj_NetStreamFfmpeg_h
>> diff -N patches/patch-server_asobj_NetStreamFfmpeg_h
>> --- patches/patch-server_asobj_NetStreamFfmpeg_h 24 Sep 2007 07:46:38
>> -0000 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,13 +0,0 @@
>> -$OpenBSD: patch-server_asobj_NetStreamFfmpeg_h,v 1.1 2007/09/24 07:46:38
>> jakemsr Exp $
>> ---- server/asobj/NetStreamFfmpeg.h.orig Mon Sep 10 23:43:35 2007
>> -+++ server/asobj/NetStreamFfmpeg.h Mon Sep 10 23:43:58 2007
>> -@@ -39,7 +39,9 @@
>> - #include "impl.h"
>> - #include "video_stream_instance.h"
>> -
>> -+extern "C" {
>> - #include <ffmpeg/avformat.h>
>> -+}
>> -
>> - #include "image.h"
>> - #include "StreamProvider.h"
>> Index: patches/patch-server_asobj_NetStreamGst_cpp
>> ===================================================================
>> RCS file: patches/patch-server_asobj_NetStreamGst_cpp
>> diff -N patches/patch-server_asobj_NetStreamGst_cpp
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-server_asobj_NetStreamGst_cpp 25 Jun 2008 00:10:24
>> -0000
>> @@ -0,0 +1,74 @@
>> +$OpenBSD$
>> +--- server/asobj/NetStreamGst.cpp.orig Tue Jun 3 20:11:29 2008
>> ++++ server/asobj/NetStreamGst.cpp Tue Jun 24 20:10:07 2008
>> +@@ -84,6 +84,7 @@ NetStreamGst::NetStreamGst()
>> +
>> + // Setup video conversion and sink
>> +
>> ++ GstElement* video_queue = gst_element_factory_make ("queue",
>> "gnash_videoqueue");
>> +
>> + // setup the video colorspaceconverter converter
>> + GstElement* colorspace = gst_element_factory_make ("ffmpegcolorspace",
>> "gnash_colorspace");
>> +@@ -112,21 +113,27 @@ NetStreamGst::NetStreamGst()
>> +
>> + // Create the video pipeline and link the elements. The pipeline will
>> + // dereference the elements when they are destroyed.
>> +- gst_bin_add_many (GST_BIN (_videobin), colorspace, videoscale,
>> videocaps, videosink, NULL);
>> ++ gst_bin_add_many (GST_BIN (_videobin), video_queue, colorspace,
>> videoscale,
>> ++ videocaps, videosink, NULL);
>> +
>> +- if (!colorspace || !videoscale || !videocaps || !videosink) {
>> ++ if (!video_queue || !colorspace || !videoscale || !videocaps ||
>> !videosink) {
>> + log_error(_("Couldn't create the Gstreamer video conversion elements. "
>> + "Please make sure Gstreamer and gstreamer-plugins-base are
>> "
>> + "correctly installed. Video playback will not be
>> possible."));
>> + }
>> +
>> +- rv = gst_element_link_many(colorspace, videoscale, videocaps, videosink,
>> NULL);
>> ++ rv = gst_element_link_many(video_queue, colorspace, videoscale,
>> videocaps, videosink, NULL);
>> + if (!rv) {
>> + log_error(_("Failed to link video conversion elements. Video playback
>> will"
>> + " not be possible"));
>> + }
>> +
>> ++ GstPad* target_videopad = gst_element_get_static_pad (video_queue,
>> "sink");
>> ++ gst_element_add_pad(_videobin, gst_ghost_pad_new ("sink",
>> target_videopad));
>> ++ gst_object_unref(GST_OBJECT(target_videopad));
>> ++
>> + // Setup audio sink
>> ++ GstElement* audio_queue = gst_element_factory_make ("queue",
>> "gnash_audioqueue");
>> + GstElement* audioconvert = gst_element_factory_make ("audioconvert",
>> NULL);
>> + GstElement* audioresample = gst_element_factory_make ("audioresample",
>> NULL);
>> +
>> +@@ -143,27 +150,20 @@ NetStreamGst::NetStreamGst()
>> + audiosink = gst_element_factory_make ("fakesink", NULL);
>> + }
>> +
>> +- gst_bin_add_many(GST_BIN(_audiobin), audioconvert, audioresample,
>> audiosink, NULL);
>> ++ gst_bin_add_many(GST_BIN(_audiobin), audio_queue, audioconvert,
>> audioresample, audiosink, NULL);
>> +
>> +- if (!audioconvert || !audiosink || !audioresample) {
>> ++ if (!audio_queue || !audioconvert || !audiosink || !audioresample) {
>> + log_error("Couldn't create Gstreamer audio elements. Audio playback
>> will "
>> + "not be possible");
>> + }
>> +- rv = gst_element_link_many(audioconvert, audioresample, audiosink, NULL);
>> ++ rv = gst_element_link_many(audio_queue, audioconvert, audioresample,
>> audiosink, NULL);
>> + if (!rv) {
>> + log_error("Couldn't link audio elements. There will be no audio
>> playback.");
>> + }
>> +
>> +- GstPad* target_audiopad = gst_element_get_static_pad (audioconvert,
>> "sink");
>> +- GstPad* target_videopad = gst_element_get_static_pad (colorspace,
>> "sink");
>> +-
>> +- gst_element_add_pad(_videobin, gst_ghost_pad_new ("sink",
>> target_videopad));
>> ++ GstPad* target_audiopad = gst_element_get_static_pad (audio_queue,
>> "sink");
>> + gst_element_add_pad(_audiobin, gst_ghost_pad_new ("sink",
>> target_audiopad));
>> +-
>> +- gst_object_unref(GST_OBJECT(target_videopad));
>> + gst_object_unref(GST_OBJECT(target_audiopad));
>> +-
>> +-
>> + }
>> +
>> + NetStreamGst::~NetStreamGst()
>> Index: patches/patch-server_asobj_SoundFfmpeg_h
>> ===================================================================
>> RCS file: patches/patch-server_asobj_SoundFfmpeg_h
>> diff -N patches/patch-server_asobj_SoundFfmpeg_h
>> --- patches/patch-server_asobj_SoundFfmpeg_h 24 Sep 2007 07:46:38 -0000
>> 1.1
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,13 +0,0 @@
>> -$OpenBSD: patch-server_asobj_SoundFfmpeg_h,v 1.1 2007/09/24 07:46:38
>> jakemsr Exp $
>> ---- server/asobj/SoundFfmpeg.h.orig Mon Sep 10 23:42:46 2007
>> -+++ server/asobj/SoundFfmpeg.h Mon Sep 10 23:43:05 2007
>> -@@ -32,7 +32,9 @@
>> - #include <boost/bind.hpp>
>> - #include <boost/thread/mutex.hpp>
>> -
>> -+extern "C" {
>> - #include <ffmpeg/avformat.h>
>> -+}
>> -
>> - namespace gnash {
>> -
>> Index: patches/patch-server_asobj_SoundGst_cpp
>> ===================================================================
>> RCS file: patches/patch-server_asobj_SoundGst_cpp
>> diff -N patches/patch-server_asobj_SoundGst_cpp
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-server_asobj_SoundGst_cpp 27 Jun 2008 12:15:20 -0000
>> @@ -0,0 +1,21 @@
>> +$OpenBSD$
>> +--- server/asobj/SoundGst.cpp.orig Fri Jun 27 08:13:34 2008
>> ++++ server/asobj/SoundGst.cpp Fri Jun 27 08:15:11 2008
>> +@@ -228,7 +228,7 @@ SoundGst::getDuration()
>> + }
>> +
>> + GstFormat fmt = GST_FORMAT_TIME;
>> +- boost::int64_t len;
>> ++ gint64 len;
>> +
>> + if (_pipeline && gst_element_query_duration (_pipeline, &fmt, &len)) {
>> + return static_cast<unsigned int>(len / GST_MSECOND);
>> +@@ -249,7 +249,7 @@ SoundGst::getPosition()
>> + if (!_pipeline) return 0;
>> +
>> + GstFormat fmt = GST_FORMAT_TIME;
>> +- boost::int64_t pos;
>> ++ gint64 pos;
>> + GstStateChangeReturn ret;
>> + GstState current, pending;
>> +
>> Index: pkg/PLIST
>> ===================================================================
>> RCS file: /cvs/ports/www/gnash/pkg/PLIST,v
>> retrieving revision 1.3
>> diff -u -p -r1.3 PLIST
>> --- pkg/PLIST 7 Jul 2007 10:47:04 -0000 1.3
>> +++ pkg/PLIST 25 Jun 2008 00:07:13 -0000
>> @@ -1,27 +1,53 @@
>> [EMAIL PROTECTED] $OpenBSD: PLIST,v 1.3 2007/07/07 10:47:04 deanna Exp $
>> [EMAIL PROTECTED] $OpenBSD$
>> [EMAIL PROTECTED] bin/dumpshm
>> bin/gnash
>> -bin/gparser
>> -bin/gprocessor
>> -lib/libgnashamf.la
>> [EMAIL PROTECTED] lib/libgnashamf.so.${LIBgnashamf_VERSION}
>> -lib/libgnashbackend.la
>> [EMAIL PROTECTED] lib/libgnashbackend.so.${LIBgnashbackend_VERSION}
>> -lib/libgnashbase.la
>> [EMAIL PROTECTED] lib/libgnashbase.so.${LIBgnashbase_VERSION}
>> -lib/libgnashgeo.la
>> [EMAIL PROTECTED] lib/libgnashgeo.so.${LIBgnashgeo_VERSION}
>> -lib/libgnashgui.la
>> [EMAIL PROTECTED] lib/libgnashgui.so.${LIBgnashgui_VERSION}
>> -lib/libgnashplayer.la
>> [EMAIL PROTECTED] lib/libgnashplayer.so.${LIBgnashplayer_VERSION}
>> -lib/libgnashserver.la
>> [EMAIL PROTECTED] lib/libgnashserver.so.${LIBgnashserver_VERSION}
>> [EMAIL PROTECTED] bin/gprocessor
>> [EMAIL PROTECTED] bin/gtk-gnash
>> [EMAIL PROTECTED] bin/soldumper
>> +lib/gnash/
>> +lib/gnash/libgnashamf-${VER}.so
>> +lib/gnash/libgnashamf.la
>> +lib/gnash/libgnashamf.so
>> +lib/gnash/libgnashbase-${VER}.so
>> +lib/gnash/libgnashbase.la
>> +lib/gnash/libgnashbase.so
>> +lib/gnash/libgnashmedia-${VER}.so
>> +lib/gnash/libgnashmedia.la
>> +lib/gnash/libgnashmedia.so
>> +lib/gnash/libgnashnet.la
>> [EMAIL PROTECTED] lib/gnash/libgnashnet.so.${LIBgnashnet_VERSION}
>> +lib/gnash/libgnashserver-${VER}.so
>> +lib/gnash/libgnashserver.la
>> +lib/gnash/libgnashserver.so
>> +lib/gnash/libmozsdk.la
>> [EMAIL PROTECTED] lib/gnash/libmozsdk.so.${LIBmozsdk_VERSION}
>> lib/mozilla-plugins/
>> lib/mozilla-plugins/libgnashplugin.so
>> [EMAIL PROTECTED] man/man1/cygnal.1
>> [EMAIL PROTECTED] man/man1/dumpshm.1
>> @man man/man1/gnash.1
>> [EMAIL PROTECTED] man/man1/gprocessor.1
>> [EMAIL PROTECTED] man/man1/soldumper.1
>> +share/doc/gnash/
>> +share/doc/gnash/gnashref.html
>> +share/doc/gnash/gnashuser.html
>> +share/doc/gnash/images/
>> +share/doc/gnash/images/car_crash.png
>> +share/doc/gnash/images/rtmp.png
>> +share/examples/gnash/
>> [EMAIL PROTECTED] ${SYSCONFDIR}/gnash/
>> +share/examples/gnash/gnashpluginrc
>> [EMAIL PROTECTED] ${SYSCONFDIR}/gnash/gnashpluginrc
>> +share/examples/gnash/gnashrc
>> [EMAIL PROTECTED] ${SYSCONFDIR}/gnash/gnashrc
>> share/gnash/
>> share/gnash/GnashG.png
>> share/gnash/gnash_128_96.ico
>> +share/locale/cs/LC_MESSAGES/gnash.mo
>> share/locale/de/LC_MESSAGES/gnash.mo
>> share/locale/es/LC_MESSAGES/gnash.mo
>> +share/locale/fi/LC_MESSAGES/gnash.mo
>> share/locale/fr/LC_MESSAGES/gnash.mo
>> +share/locale/it/LC_MESSAGES/gnash.mo
>> +share/locale/ja/LC_MESSAGES/gnash.mo
>> +share/locale/sv/LC_MESSAGES/gnash.mo
>>
>
>
