From 4a1168c5ff99796c9587c3324a93778252bb0086 Mon Sep 17 00:00:00 2001 From: Aldas Nabazas Date: Sun, 31 Aug 2008 11:48:33 +0200 Subject: [PATCH] openlibraries: Updated (0.4.0 -> 0.4.0-r1422) --- multimedia/openlibraries/compile-fix.patch | 48 ------------------- .../openlibraries/matching-function.patch | 41 ---------------- multimedia/openlibraries/openlibraries.cache | 34 ++++--------- multimedia/openlibraries/openlibraries.conf | 22 --------- multimedia/openlibraries/openlibraries.desc | 9 ++-- 5 files changed, 16 insertions(+), 138 deletions(-) delete mode 100644 multimedia/openlibraries/compile-fix.patch delete mode 100644 multimedia/openlibraries/matching-function.patch delete mode 100644 multimedia/openlibraries/openlibraries.conf diff --git a/multimedia/openlibraries/compile-fix.patch b/multimedia/openlibraries/compile-fix.patch deleted file mode 100644 index df56df14f..000000000 --- a/multimedia/openlibraries/compile-fix.patch +++ /dev/null @@ -1,48 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../openlibraries/compile-fix.patch -# Copyright (C) 2008 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -diff -Nur openlibraries-0.4.0-orig/src/openmedialib/plugins/avformat/avformat_plugin.cpp openlibraries-0.4.0/src/openmedialib/plugins/avformat/avformat_plugin.cpp ---- openlibraries-0.4.0-orig/src/openmedialib/plugins/avformat/avformat_plugin.cpp 2008-02-26 18:31:24.000000000 +0100 -+++ openlibraries-0.4.0/src/openmedialib/plugins/avformat/avformat_plugin.cpp 2008-02-26 18:38:39.000000000 +0100 -@@ -10,6 +10,10 @@ - #include - #include - -+#ifndef INT64_C -+#define INT64_C(x) x ## LL -+#endif // INT64_C -+ - #ifdef WIN32 - #include - #endif // WIN32 -@@ -1917,7 +1921,7 @@ - { - public: - // filter_type overloads -- explicit avformat_resampler_filter::avformat_resampler_filter(const opl::wstring &) -+ explicit avformat_resampler_filter(const opl::wstring &) - : filter_type() - , prop_output_channels_(pcos::key::from_string("channels")) - , prop_output_sample_freq_(pcos::key::from_string("frequency")) -@@ -2012,7 +2016,7 @@ - } - } - -- frame_type_ptr avformat_resampler_filter::fetch() -+ frame_type_ptr fetch() - { - // Get the filter input - input_type_ptr input = fetch_slot( ); diff --git a/multimedia/openlibraries/matching-function.patch b/multimedia/openlibraries/matching-function.patch deleted file mode 100644 index de1793d5a..000000000 --- a/multimedia/openlibraries/matching-function.patch +++ /dev/null @@ -1,41 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../openlibraries/matching-function.patch -# Copyright (C) 2007 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - - - Original patch from http://openlibraries.cvs.sourceforge.net/openlibraries/openlibraries/src/openobjectlib/sg/appearance.cpp?r1=1.18&r2=1.19&view=patch - but slightly adjusted. - ---- a/src/openobjectlib/sg/appearance.cpp 2007/05/17 18:48:19 1.18 -+++ b/src/openobjectlib/sg/appearance.cpp 2007/07/20 10:16:31 1.19 -@@ -53,12 +53,15 @@ - - opl::wstring filename_; - }; -- -+ - bool find_url_availability( const opl::m_url& m, fs::path& p ) - { - typedef opl::m_url::const_iterator const_iterator; -- -- const_iterator I = std::find_if( m.begin( ), m.end( ), fs::exists ); -+ -+ //M> for some reason it MSVC8 doesnt like this call, and needs help with the template types -+ typedef bool (*fileSystemFunc)( const boost::filesystem::path & ph ); -+ -+ const_iterator I = std::find_if(m.begin() , m.end(), fs::exists ); - if( I != m.end( ) ) - { - p = *I; diff --git a/multimedia/openlibraries/openlibraries.cache b/multimedia/openlibraries/openlibraries.cache index eebacaace..388973456 100644 --- a/multimedia/openlibraries/openlibraries.cache +++ b/multimedia/openlibraries/openlibraries.cache @@ -1,63 +1,49 @@ -[TIMESTAMP] 1162640216 Sat Nov 4 12:36:56 2006 -[BUILDTIME] 140 (5) -[SIZE] 21.99 MB, 352 files +[TIMESTAMP] 1220175704 Sun Aug 31 11:41:44 2008 +[BUILDTIME] 130 (5) +[SIZE] 37.25 MB, 528 files -[DEP] 00-dirtree [DEP] bash [DEP] binutils [DEP] boost [DEP] bzip2 -[DEP] xorg-cf-files +[DEP] cgtoolkit +[DEP] cmake [DEP] coreutils [DEP] diffutils -[DEP] faac [DEP] ffmpeg -[DEP] file +[DEP] fhs [DEP] findutils [DEP] freeglut [DEP] gawk [DEP] gcc [DEP] glew [DEP] glibc +[DEP] gnupth [DEP] grep -[DEP] imake -[DEP] lame -[DEP] libdrm +[DEP] ilmbase [DEP] libice [DEP] libjpeg -[DEP] libogg [DEP] libpng +[DEP] libsdl [DEP] libsm -[DEP] libtheora -[DEP] libtiff -[DEP] libvorbis [DEP] libx11 [DEP] libxau -[DEP] libxdmcp +[DEP] libxcb [DEP] libxext [DEP] libxi [DEP] libxml [DEP] libxmu -[DEP] libxt -[DEP] libxxf86vm [DEP] linux-header [DEP] make [DEP] mesa -[DEP] mktemp -[DEP] mlt -[DEP] mlt++ -[DEP] net-tools [DEP] openal [DEP] openexr [DEP] pkgconfig [DEP] python [DEP] sed -[DEP] sqlite [DEP] sysfiles [DEP] tar [DEP] util-linux -[DEP] x264 [DEP] xproto -[DEP] xvid [DEP] zlib diff --git a/multimedia/openlibraries/openlibraries.conf b/multimedia/openlibraries/openlibraries.conf deleted file mode 100644 index 2fb2c74f9..000000000 --- a/multimedia/openlibraries/openlibraries.conf +++ /dev/null @@ -1,22 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../openlibraries/openlibraries.conf -# Copyright (C) 2006 - 2007 The OpenSDE Project -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- SDE-COPYRIGHT-NOTE-END --- - -var_append confopt ' ' "--with-boostthreadruntime=mt" - -[[ $libdir != *lib ]] && var_append GCC_WRAPPER_REMOVE " " "/usr/lib64/../lib/libstdc++.so" - -# needs to be told where to search glew -var_append GCC_WRAPPER_APPEND ' ' "`pkg-config x11 --libs-only-L`" - diff --git a/multimedia/openlibraries/openlibraries.desc b/multimedia/openlibraries/openlibraries.desc index e04fe462d..cffba6883 100644 --- a/multimedia/openlibraries/openlibraries.desc +++ b/multimedia/openlibraries/openlibraries.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../openlibraries/openlibraries.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project [COPY] Copyright (C) 2006 The T2 SDE Project [COPY] [COPY] More information can be found in the files COPYING and README. @@ -29,7 +29,10 @@ [L] LGPL [S] Beta -[V] 0.4.0 +[V] 0.4.0-r1422 [P] X -----5---9 170.000 -[D] 756041397 openlibraries-0.4.0.tar.gz http://dl.sourceforge.net/sourceforge/openlibraries/ +[O] . $base/package/*/*/cmake-conf.in + +[D] X openlibraries-0.4.0-r1422.tar.gz svn+http://openlibraries.svn.sourceforge.net/svnroot/openlibraries/trunk -r 1422 +#[D] 756041397 openlibraries-0.4.0.tar.gz http://dl.sourceforge.net/sourceforge/openlibraries/