# HG changeset patch # User Mark Brand # Date 1313794885 -7200 # Node ID e2a680ec2f33317b3da24f3669d46862dc13d869 # Parent 4ade8a4371d03fc54a042a5736d1805c62605ee1 update packags: ffmpeg libsamplerate openscenegraph diff -r 4ade8a4371d0 -r e2a680ec2f33 src/ffmpeg.mk --- a/src/ffmpeg.mk Sat Aug 20 00:28:49 2011 +0200 +++ b/src/ffmpeg.mk Sat Aug 20 01:01:25 2011 +0200 @@ -4,8 +4,8 @@ # ffmpeg PKG := ffmpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 0.8.1 -$(PKG)_CHECKSUM := db9371ac11e36b8cb2684af5f2c2d443f8e408d2 +$(PKG)_VERSION := 0.8.2 +$(PKG)_CHECKSUM := 984f731aced1380840cd8e3576e8db0c2fd5537f $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.ffmpeg.org/ diff -r 4ade8a4371d0 -r e2a680ec2f33 src/libsamplerate.mk --- a/src/libsamplerate.mk Sat Aug 20 00:28:49 2011 +0200 +++ b/src/libsamplerate.mk Sat Aug 20 01:01:25 2011 +0200 @@ -4,8 +4,8 @@ # libsamplerate PKG := libsamplerate $(PKG)_IGNORE := -$(PKG)_VERSION := 0.1.7 -$(PKG)_CHECKSUM := f3f803ec5feae5a3fdb0fa3937277669e854386e +$(PKG)_VERSION := 0.1.8 +$(PKG)_CHECKSUM := e5fe82c4786be2fa33ca6bd4897db4868347fe70 $(PKG)_SUBDIR := libsamplerate-$($(PKG)_VERSION) $(PKG)_FILE := libsamplerate-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.mega-nerd.com/SRC/ diff -r 4ade8a4371d0 -r e2a680ec2f33 src/openscenegraph-1-mingw32.patch --- a/src/openscenegraph-1-mingw32.patch Sat Aug 20 00:28:49 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch taken from: -https://gitorious.org/openscenegraph/osg/commit/c535cf1edc2751d02fbdb9e7fef035cb797dff97?format=patch - -From c535cf1edc2751d02fbdb9e7fef035cb797dff97 Mon Sep 17 00:00:00 2001 -From: Robert OSFIELD -Date: Mon, 18 Jul 2011 09:40:58 +0000 -Subject: [PATCH] Changed the HAVE_CONFIG_H guard so that it uses #ifndef _MSC_VER rather than _WIN32 to avoid problems with Mingw and Cygwin builds of DCMTK. - ---- - src/osgPlugins/dicom/ReaderWriterDICOM.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/osgPlugins/dicom/ReaderWriterDICOM.cpp b/src/osgPlugins/dicom/ReaderWriterDICOM.cpp -index 785ac9e..500cb7e 100644 ---- a/src/osgPlugins/dicom/ReaderWriterDICOM.cpp -+++ b/src/osgPlugins/dicom/ReaderWriterDICOM.cpp -@@ -19,7 +19,7 @@ - #include - - #ifdef USE_DCMTK -- #ifndef _WIN32 -+ #ifndef _MSC_VER - #define HAVE_CONFIG_H - #endif - --- -1.6.1 diff -r 4ade8a4371d0 -r e2a680ec2f33 src/openscenegraph-2-ffmpeg-0.8.patch --- a/src/openscenegraph-2-ffmpeg-0.8.patch Sat Aug 20 00:28:49 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -Contains ad hoc patches for cross building. - -From 96c2a9b9f909399adde17e6851e08eb182c37e37 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Mon, 11 Jul 2011 10:02:48 +0200 -Subject: [PATCH] Fix for compiling OSG with the latest FFmpeg - -Patch taken from: - -http://lists.openscenegraph.org/pipermail/osg-submissions-openscenegraph.org/2011-July/008462.html - -Hi Robert, - -I've found that the latest ffmpeg made some functions and macros -deprecated, which led to compilation errors in the OSG plugin. I tried -fixing them and tested with the version ffmpeg-git-5d4fd1d (ffmpeg -version > 0.8, libavcodec = 53.7.0) under Windows. - -Cheers, - -Wang Rui - -diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp -index bd13085..1aa45fc 100644 ---- a/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp -+++ b/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp -@@ -11,6 +11,20 @@ - #include - #include - -+// Changes for FFMpeg version greater than 0.6 -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) -+#define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO -+#define CODEC_TYPE_VIDEO AVMEDIA_TYPE_VIDEO -+#endif -+ -+#ifdef AVERROR -+#define AVERROR_IO AVERROR(EIO) -+#define AVERROR_NUMEXPECTED AVERROR(EDOM) -+#define AVERROR_NOMEM AVERROR(ENOMEM) -+#define AVERROR_NOFMT AVERROR(EILSEQ) -+#define AVERROR_NOTSUPP AVERROR(ENOSYS) -+#define AVERROR_NOENT AVERROR(ENOENT) -+#endif - - namespace osgFFmpeg { - -diff --git a/src/osgPlugins/ffmpeg/FFmpegParameters.cpp b/src/osgPlugins/ffmpeg/FFmpegParameters.cpp -index bfa1819..db1736b 100644 ---- a/src/osgPlugins/ffmpeg/FFmpegParameters.cpp -+++ b/src/osgPlugins/ffmpeg/FFmpegParameters.cpp -@@ -5,6 +5,15 @@ - #include - #include - -+#if LIBAVCODEC_VERSION_MAJOR >= 53 -+extern "C" -+{ -+ #include -+} -+#define av_parse_video_frame_size av_parse_video_size -+#define av_parse_video_frame_rate av_parse_video_rate -+#endif -+ - #if LIBAVCODEC_VERSION_MAJOR >= 53 || \ - (LIBAVCODEC_VERSION_MAJOR==52 && LIBAVCODEC_VERSION_MINOR>=49) - --- -1.7.6 - diff -r 4ade8a4371d0 -r e2a680ec2f33 src/openscenegraph.mk --- a/src/openscenegraph.mk Sat Aug 20 00:28:49 2011 +0200 +++ b/src/openscenegraph.mk Sat Aug 20 01:01:25 2011 +0200 @@ -4,12 +4,12 @@ # OpenSceneGraph PKG := openscenegraph $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0.0 -$(PKG)_CHECKSUM := aa4982bf1502c8ad52b40508221978a2ca48e34e +$(PKG)_VERSION := 3.0.1 +$(PKG)_CHECKSUM := 13c7e39f6d62047ad944d8d28a0f0eb60384ce33 $(PKG)_SUBDIR := OpenSceneGraph-$($(PKG)_VERSION) $(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).zip $(PKG)_WEBSITE := http://www.openscenegraph.org/ -$(PKG)_URL := http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/$($(PKG)_FILE) +$(PKG)_URL := http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$($(PKG)_VERSION)/source/$($(PKG)_FILE) $(PKG)_URL_2 := http://distfiles.macports.org/OpenSceneGraph/$($(PKG)_FILE) $(PKG)_DEPS := gcc curl ffmpeg freetype gdal giflib jasper jpeg libpng openexr tiff xine-lib zlib dcmtk