prepare for newer ffmpeg which no longer wrap headers in 'extern "C" {}'
for inclusion from C++ sources from gnash CVS ok deanna@
This commit is contained in:
parent
acd3b70614
commit
9c84a00f56
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2007/09/15 20:38:21 merdely Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2007/09/24 07:46:38 jakemsr Exp $
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= flash player with firefox browser plugin
|
||||
DISTNAME= gnash-0.8.0
|
||||
PKGNAME= ${DISTNAME}p1
|
||||
PKGNAME= ${DISTNAME}p2
|
||||
SHARED_LIBS += gnashbase 2.0
|
||||
SHARED_LIBS += gnashgeo 2.0
|
||||
SHARED_LIBS += gnashamf 2.0
|
||||
|
13
www/gnash/patches/patch-backend_sound_handler_sdl_h
Normal file
13
www/gnash/patches/patch-backend_sound_handler_sdl_h
Normal file
@ -0,0 +1,13 @@
|
||||
$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
|
13
www/gnash/patches/patch-libbase_embedVideoDecoderFfmpeg_cpp
Normal file
13
www/gnash/patches/patch-libbase_embedVideoDecoderFfmpeg_cpp
Normal file
@ -0,0 +1,13 @@
|
||||
$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>
|
13
www/gnash/patches/patch-libbase_embedVideoDecoderFfmpeg_h
Normal file
13
www/gnash/patches/patch-libbase_embedVideoDecoderFfmpeg_h
Normal file
@ -0,0 +1,13 @@
|
||||
$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 {
|
13
www/gnash/patches/patch-server_asobj_NetStreamFfmpeg_h
Normal file
13
www/gnash/patches/patch-server_asobj_NetStreamFfmpeg_h
Normal file
@ -0,0 +1,13 @@
|
||||
$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"
|
13
www/gnash/patches/patch-server_asobj_SoundFfmpeg_h
Normal file
13
www/gnash/patches/patch-server_asobj_SoundFfmpeg_h
Normal file
@ -0,0 +1,13 @@
|
||||
$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 {
|
||||
|
Loading…
x
Reference in New Issue
Block a user