Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=456d956873079f6ef877e81b6039835c92f3ed4d

commit 456d956873079f6ef877e81b6039835c92f3ed4d
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Wed Jul 22 11:56:59 2009 +0200

openlibraries-0.4.0-10-i686

- add patch to fix build
- rebuild with openal-1.7.411

diff --git a/source/xlib-extra/openlibraries/FrugalBuild 
b/source/xlib-extra/openlibraries/FrugalBuild
index aa5ff90..824b93e 100644
--- a/source/xlib-extra/openlibraries/FrugalBuild
+++ b/source/xlib-extra/openlibraries/FrugalBuild
@@ -3,18 +3,19 @@

pkgname=openlibraries
pkgver=0.4.0
-pkgrel=9
+pkgrel=10
pkgdesc="Powerful cross-platform set of libraries to test and deploy rich media 
applications."
Finclude sourceforge python
options=('scriptlet')
-source=($source sg_appearance.cpp_compile_fix.patch gcc43.patch)
-depends=('libboost-mt>=1.37.0' 'glew>=1.5.0' 'libgcc' 'libjpeg' 'libpng' 
'libtiff' 'freeglut' 'openal' 'sqlite3' 'python>=2.6')
+source=($source sg_appearance.cpp_compile_fix.patch gcc4{3,4}.patch)
+depends=('libboost-mt>=1.37.0' 'glew>=1.5.0' 'libgcc' 'libjpeg' 'libpng' 
'libtiff' 'freeglut' 'openal>=1.7.411' 'sqlite3' 'python>=2.6')
makedepends=('boost>=1.37.0')
groups=('xlib-extra')
archs=('i686' 'x86_64')
sha1sums=('7ebe24cfdc16c4869a74c0736bd4069f1ceff44c' \
'05b30bc14c15c0a3d0fdcfeac8ba96dbe1b49136' \
-          '254a2c21c5c4e3db04b6f480b48b1f70817d4b22')
+          '254a2c21c5c4e3db04b6f480b48b1f70817d4b22' \
+          'dca9055c22285c9a91515a943fb3deccc1e8c9e6')

build()
{
diff --git a/source/xlib-extra/openlibraries/gcc44.patch 
b/source/xlib-extra/openlibraries/gcc44.patch
new file mode 100644
index 0000000..e8a5964
--- /dev/null
+++ b/source/xlib-extra/openlibraries/gcc44.patch
@@ -0,0 +1,77 @@
+--- ./src/openmedialib/plugins/avformat/avformat_plugin.cpp.orig       
2009-07-22 11:39:31.000000000 +0200
++++ ./src/openmedialib/plugins/avformat/avformat_plugin.cpp    2009-07-22 
11:42:26.000000000 +0200
+@@ -28,7 +28,7 @@
+
+
+ extern "C" {
+-#include <avformat.h>
++#include <libavformat/avformat.h>
+ }
+
+ namespace oml = olib::openmedialib;
+@@ -308,7 +308,7 @@
+
+                               // Close the output file
+                               if ( !( fmt_->flags & AVFMT_NOFILE ) )
+-                                      url_fclose( &oc_->pb );
++                                      url_fclose( oc_->pb );
+
+                               // Free the context
+                               av_free( oc_ );
+@@ -1156,7 +1156,7 @@
+                       int error = av_open_input_file( &context_, 
opl::to_string( resource ).c_str( ), format_, 0, params_ ) < 0;
+
+                       // Check for streaming
+-                      if ( error == 0 && url_is_streamed( &context_->pb ) )
++                      if ( error == 0 && url_is_streamed( context_->pb ) )
+                       {
+                               is_seekable_ = false;
+                               key_search_ = true;
+@@ -1917,7 +1917,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 +2012,7 @@
+                       }
+               }
+
+-              frame_type_ptr avformat_resampler_filter::fetch()
++              frame_type_ptr fetch()
+               {
+                       // Get the filter input
+                       input_type_ptr input = fetch_slot( );
+--- ./src/openmedialib/ml/filter.hpp.orig      2009-07-22 11:34:45.000000000 
+0200
++++ ./src/openmedialib/ml/filter.hpp   2009-07-22 11:34:55.000000000 +0200
+@@ -8,6 +8,7 @@
+ #define OPENMEDIALIB_FILTER_INC_
+
+ #include <vector>
++#include <stdio.h>
+ #include <boost/shared_ptr.hpp>
+ #include <openmedialib/ml/frame.hpp>
+ #include <openmedialib/ml/input.hpp>
+--- ./src/openimagelib/plugins/jpg/jpg_plugin.cpp.orig 2009-07-22 
11:33:49.000000000 +0200
++++ ./src/openimagelib/plugins/jpg/jpg_plugin.cpp      2009-07-22 
11:34:01.000000000 +0200
+@@ -8,6 +8,7 @@
+ #include <cstdlib>
+ #include <vector>
+ #include <string>
++#include <stdio.h>
+
+ #include <openimagelib/plugins/jpg/jpg_plugin.hpp>
+
+--- ./src/openimagelib/il/utility.cpp.orig     2009-07-22 11:32:37.000000000 
+0200
++++ ./src/openimagelib/il/utility.cpp  2009-07-22 11:32:59.000000000 +0200
+@@ -8,6 +8,7 @@
+ #include <algorithm>
+ #include <cmath>
+ #include <limits>
++#include <stdio.h>
+
+ using namespace std;
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to