Added upstream patch to build against system boost

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 236 insertions, 17 deletions

diff --git a/media-video/bombono-dvd/ChangeLog b/media-video/bombono-dvd/ChangeLog
index c70c4a3478e2..edcf5cf8a497 100644
--- a/media-video/bombono-dvd/ChangeLog
+++ b/media-video/bombono-dvd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/bombono-dvd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.4 2010/11/04 22:24:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.5 2010/11/04 23:15:48 dilfridge Exp $
+
+  04 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  bombono-dvd-0.8.0.ebuild, +files/bombono-dvd-0.8.0-boost.patch:
+  Added upstream patch to build against system boost. Thanks to Ilya
+  Muravev, author of bombono-dvd, for the help!
 
 *bombono-dvd-0.8.0 (04 Nov 2010)
 
diff --git a/media-video/bombono-dvd/Manifest b/media-video/bombono-dvd/Manifest
index 0548bb4d668b..087a275678e6 100644
--- a/media-video/bombono-dvd/Manifest
+++ b/media-video/bombono-dvd/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX bombono-dvd-0.8.0-boost.patch 7989 RMD160 75242f5a9a26bd80be5187a7fcf7f1bc89455708 SHA1 6f8d0d80522f2a0f9c5517442ed1c139e60c9b48 SHA256 f0ad29289ed8a7e172d10372bb6fb34d4b7865b387365e8354d2bfed0d01aee6
 DIST bombono-dvd-0.6.0.tar.bz2 1788565 RMD160 0d7b967c3269cb79f7a5b132711dedfeb97d29bc SHA1 8676c2e92da8e0cdba913285573a0993bafab8c4 SHA256 5269ab45825e776017a2d6ea5d93a86509164ec3a8c5a848370749efa05cc868
 DIST bombono-dvd-0.8.0.tar.bz2 2157320 RMD160 53d6ff2063cc6cc02e8b740ccaa38793daf9005b SHA1 cbda352c19ae488a1c108319c7bc2132b8f09c10 SHA256 0c15f8ce829f1f2df51d6598ad990302d874ce267a3e2f7f174bf0831921c1c3
 EBUILD bombono-dvd-0.6.0.ebuild 1252 RMD160 1756f540f8793e72f55e9329c8dafbb0650ee07d SHA1 c3e2e908d8623dab5c9f988113b6a736a60030d3 SHA256 cc33eff21c4b7afbf3f7d6f4be9371c5a097c0a0a7c6ec90badd116ca6e7b5cc
-EBUILD bombono-dvd-0.8.0.ebuild 1240 RMD160 44e4297170bb15d74e20b562c60cdd4c970cbbca SHA1 0d2d337b22736e593da8cbfe39a3f5f59c1176bc SHA256 dca6742c1e203df088fcea5ff24ae3a1973b7b1b7ba834fc06568e87fc25d8ca
-MISC ChangeLog 1586 RMD160 f846df966945f18616076cfd23d0fbd38d169ebb SHA1 e515fd19b14481cab1867b64ff5e64321faeb0e3 SHA256 7d19a27f52b46c778e9ef15a97393cd27a14b34c654cc32a03217eef890a0ac9
+EBUILD bombono-dvd-0.8.0.ebuild 1344 RMD160 d6e297de9399e9cedb36f2ff4b8e3488029be012 SHA1 0d045dc1787c088a856caf42b307aa1111a36a6f SHA256 604a0c76b1f2b4596176f2b63444f3ddb3dec45c172351f74c2b89352da506f0
+MISC ChangeLog 1827 RMD160 817129317a8f066efebb0d5a1994923f1d555883 SHA1 20475150d708b85dd05fb5d016a501ba930cb86a SHA256 24cdcce4be67b90407fa3d51dcd47c71c96412f1a19c7cdd01ea4f800bee7359
 MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJM0zKLAAoJENwGBM22xffeRZYP/2hexTkI/2UKsovTbUdkKC9B
-6YHZxOHXa5lB3F7Z9WqCPJCpW3Og9MY784nX3g3Ec99SLXbU96Hu48Qevl4giEwB
-5MWfSwsHz2cMQMBnjHgHGL2JVfBo1cgTrexyB/nsx2hcu5/feXiWK0WoNRMf1QFU
-KzFAe2IcplJ4vctNZQ8bvthFZemazQ9ZnsJtzN9kP8T14ZvKVs4q5QyjaprcRvCL
-h8nsiy/0hoswPZa3+q6h0WoBKygFrtxDaietEo8+zdABT21INcUsHrbCmuwbql49
-2uIHQ2+kRyn6wBF5wqt5j7dWF/75ZEqWwxyy5CHJDOXD5PsoGIcTwLCjrUiUhxfS
-qzWhJKIdirWoF/k/035uaOWSDhW+jr81zNMklk1rHku+p/3uR2ST3MWiDcFyQzvf
-yPiFBGZVj2Udcvw84layn3bbcNOCOMPOSIN8bbo+e6h5hEU7VXXFnMnMPtWfeN8O
-GdYrKcpi2zbBfSJa+BO77xvlXtjCMLbVqAdXBUB+iQWXDutvt7ao15k6b5VzLp+8
-qxczFXpaa5R2keOZA2v4qZKQrD5fatDogxfPdHekYMP3Z+MywTMH8d4nF+EZLeqg
-ViU8ejjBEUota3VKk2BI5TfLF1dOyKdPeGGMV3bsD3trEGuEtCsvDhXu6ID46+bf
-lezlBVX3ZVt1JKuJOhpH
-=wKwU
+iQIcBAEBAgAGBQJM0z6eAAoJENwGBM22xffeFm0QAJqaDvAUPLZMKle107yOkPA9
+GZH0mRcAxg/HWdxMdwfjR2Wdq3bht+kmuG2WN1v0QsqS8UfLS13cWQnmBbBnXVG0
+CMy5nEK4J72GTqEIz4XO/HzOQ53f567Ff/SRKjGr6MJMRxlXFg9UwJUumUFdq2ET
+SwoSurU4kX2IHWUTmjb91jTkwPdPEIO9gh7YyNqKf8mCvJyfjP2FBxrAp82Snr0V
+TuTHigpp3YMG64bD5XD/0NX2i1FyFEuEl9nIKHGKZ27VAG7497acH6nXug8bNdi8
+PwelE3YtqCuYjqxEfSy3ngv+fQfu37sywy48yNYPCCNCFSRMwVtNQPiRTfc7pRcg
+HYgacULX8xda4h50wEoqJssen+G7CpBaLbOrW5E+d0VdP6MShTLiXn7trKItnnPk
+3xfIIlFhGdNW2SE+axbsBJhsThFYJsKm4YZqdGU2U/9OqkFi0eH8UZsH6k9EJm4+
+C/oi9UbQ6zMiP0fL7F0QSNxwHqqhmcmsIGwmBG7++4MWwB122DEAqj7Sl44T8Wzf
+j9x/pMlwtrXzhKZ6AdS7KCJ8afu0TlR8TgAeuZYfQlVldYZMyORjV7sBzXo85X+a
+mYBlzY1qe5ZYdi6kFUEZ+i7UqF9lOBnftcG6mQ/FSgVpfqs2MDXfUftIEk3Qo6aQ
+Re+ef4NhvVMZZIg+TAmj
+=LsYw
 -----END PGP SIGNATURE-----
diff --git a/media-video/bombono-dvd/bombono-dvd-0.8.0.ebuild b/media-video/bombono-dvd/bombono-dvd-0.8.0.ebuild
index 7c824fdbdb99..9a3a71d21065 100644
--- a/media-video/bombono-dvd/bombono-dvd-0.8.0.ebuild
+++ b/media-video/bombono-dvd/bombono-dvd-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/bombono-dvd-0.8.0.ebuild,v 1.1 2010/11/04 22:24:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/bombono-dvd-0.8.0.ebuild,v 1.2 2010/11/04 23:15:48 dilfridge Exp $
 
 EAPI=2
 
@@ -30,12 +30,15 @@ RDEPEND=">=x11-libs/gtk+-2.8
 DEPEND=">=dev-util/scons-0.96.1
 	${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-boost.patch" )
+
 src_compile() {
 	# scons options differ from make options -> remove everything except "-jX" and "-j X"
 	local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
 
 	scons CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		LDFLAGS="${LDFLAGS}" ${sconsopts} DESTDIR="${D}" PREFIX="/usr" \
+		CPPFLAGS='-UBOOST_SYSTEM_NO_DEPRECATED' USE_EXT_BOOST=1 \
 		|| die 'Please add "${S}/config.opts" when filing bugs reports!'
 }
 
diff --git a/media-video/bombono-dvd/files/bombono-dvd-0.8.0-boost.patch b/media-video/bombono-dvd/files/bombono-dvd-0.8.0-boost.patch
new file mode 100644
index 000000000000..7e08da584446
--- /dev/null
+++ b/media-video/bombono-dvd/files/bombono-dvd-0.8.0-boost.patch
@@ -0,0 +1,210 @@
+diff --git a/SConstruct b/SConstruct
+index fa391c9..4ca4bd1 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -107,6 +107,13 @@ def CalcCommonFlags():
+                     '_ISOC99_SOURCE'                # C99 extentions: snprintf()
+                   ]
+ 
++#
++# Users CPPFLAGS support
++# Because SCons cannot handle -U option (~ #undef) it is done via
++# additional variable named POST_CPPFLAGS
++#
++UserCppFlags = ''
++
+ def AdjustConfigOptions(env):
+     CalcCommonFlags()
+ 
+@@ -130,6 +137,7 @@ def AdjustConfigOptions(env):
+     env.Append(CCFLAGS = BV.CFlags.split())
+     env.Append(CXXFLAGS = BV.CxxFlags.split())
+     env.Append(LINKFLAGS = BV.LdFlags.split())
++    env.Append(POST_CPPFLAGS = UserCppFlags.split())
+         
+     # :TODO: set them when need
+     #env.Replace (PATH = user_options_dict['PATH'])
+@@ -185,9 +193,10 @@ def ParseVariables(user_options):
+             ('DESTDIR', 'Set the intermediate install directory.', ''),
+             ('CC', 'C compiler.'),
+             ('CXX', 'C++ compiler.'),
+-    		('CFLAGS',  'Extra C Compiler flags (for C++ too).', ''),
+-    		('CXXFLAGS','Extra C++ Compiler flags.', ''),
+-    		('LDFLAGS', 'Extra Linker flags.', ''),
++            ('CPPFLAGS','Extra CPP flags.', ''),
++            ('CFLAGS',  'Extra C Compiler flags (for C++ too).', ''),
++            ('CXXFLAGS','Extra C++ Compiler flags.', ''),
++            ('LDFLAGS', 'Extra Linker flags.', ''),
+             (BoolVariable('TEST',
+                         'Set to 1 if you want to build and run tests.',
+                         'false')),
+@@ -230,6 +239,8 @@ def ParseVariables(user_options):
+ 
+     BV.Cc  = user_options_dict['CC']
+     BV.Cxx = user_options_dict['CXX']
++    global UserCppFlags
++    UserCppFlags  = user_options_dict['CPPFLAGS']
+     BV.CFlags = user_options_dict['CFLAGS']
+     BV.CxxFlags = user_options_dict['CXXFLAGS']
+     BV.LdFlags  = user_options_dict['LDFLAGS']
+@@ -262,8 +273,10 @@ else:
+     user_options = Variables(None, BV.Args)
+     ParseVariables(user_options)
+     try:
++        def write_name_value(name, val):
++            config.write('%s = %r\n' % (name, val))
+         def write_dict_value(name):
+-            config.write('%s = %r\n' % (name, user_options_dict[name]))
++            write_name_value(name, user_options_dict[name])
+ 
+         # save to file
+         config = open(BV.CfgFile, 'w')
+@@ -280,6 +293,7 @@ else:
+         config.write('\n# Compiler information\n')
+         config.write('CC = %r\n' % (BV.Cc))
+         config.write('CXX = %r\n' % (BV.Cxx))
++        write_name_value('CPPFLAGS', UserCppFlags)
+         config.write('CFLAGS = %r\n' % (BV.CFlags))
+         config.write('CXXFLAGS = %r\n' % (BV.CxxFlags))
+         config.write('LDFLAGS = %r\n' % (BV.LdFlags))
+diff --git a/libs/SConscript b/libs/SConscript
+index 043b809..bbb1072 100644
+--- a/libs/SConscript
++++ b/libs/SConscript
+@@ -19,7 +19,7 @@ else:
+ 
+ boost_dict = { 'LIBPATH' : user_options_dict['BOOST_LIBPATH'] }
+ if BV.IsToBuildQuick():
+-    boost_dict['CPP_POST_FLAGS'] = BV.MakeIncludeOptions(user_options_dict['BOOST_INCLUDE'], 1)
++    boost_dict['POST_CPPINCFLAGS'] = BV.MakeIncludeOptions(user_options_dict['BOOST_INCLUDE'], 1)
+ else:
+     boost_dict['CPPPATH'] = user_options_dict['BOOST_INCLUDE']
+ if not embedded_boost:
+diff --git a/src/mgui/author/render.cpp b/src/mgui/author/render.cpp
+index c91a244..4310898 100644
+--- a/src/mgui/author/render.cpp
++++ b/src/mgui/author/render.cpp
+@@ -453,6 +453,17 @@ static void FFmpegError(const std::string& msg)
+     Author::Error(FFmpegErrorTemplate(), msg);
+ }
+ 
++static std::string errno2str()
++{
++    namespace bs = boost::system;
++#if BOOST_MINOR_VERSION >= 44
++    const bs::error_category& s_cat = bs::system_category();
++#else
++    const bs::error_category& s_cat = bs::system_category; // = bs::get_system_category();
++#endif 
++    return bs::error_code(errno, s_cat).message();
++}
++
+ static void WriteAsPPM(int fd, RefPtr<Gdk::Pixbuf> pix, TrackBuf& buf)
+ {
+     int wdh = pix->get_width();
+@@ -491,10 +502,7 @@ static void WriteAsPPM(int fd, RefPtr<Gdk::Pixbuf> pix, TrackBuf& buf)
+     ASSERT( cur - beg == sz );
+     //checked_writeall(fd, beg, sz);
+     if( !writeall(fd, beg, sz) )
+-    {
+-        namespace bs = boost::system;
+-        FFmpegError(bs::error_code(errno, bs::system_category()).message());
+-    }
++        FFmpegError(errno2str());
+ }
+ 
+ std::string FFmpegPostArgs(const std::string& out_fname, bool is_4_3, bool is_pal, 
+diff --git a/src/mlib/tech.h b/src/mlib/tech.h
+index 771c463..0cd9867 100644
+--- a/src/mlib/tech.h
++++ b/src/mlib/tech.h
+@@ -27,6 +27,7 @@
+ // 
+ #include <boost/current_function.hpp>  // для BOOST_CURRENT_FUNCTION
+ #include <boost/detail/endian.hpp>     // для BOOST_XXX_ENDIAN
++#include <boost/version.hpp>           // для BOOST_MINOR_VERSION
+ 
+ // для С-шного кода в С++
+ #if defined(__cplusplus) || defined(c_plusplus)
+@@ -85,6 +86,8 @@ void AssertImpl(const char* assertion, const char* file,
+ #   error mlib/tech.h: unknown endianness (legacy PDP arch?)
+ #endif
+ 
++#define BOOST_MINOR_VERSION (BOOST_VERSION / 100 % 1000)
++
+ // gcc 4.4 вываливает кучу предупреждений о strict-alias rules
+ // (только при >= -O2), но чувствую, что неправильно
+ 
+diff --git a/src/mlib/tests/turn_on_test_main.h b/src/mlib/tests/turn_on_test_main.h
+index fa3e545..f67e4aa 100644
+--- a/src/mlib/tests/turn_on_test_main.h
++++ b/src/mlib/tests/turn_on_test_main.h
+@@ -22,12 +22,12 @@
+ #ifndef __MLIB_TESTS_TEST_TOTM_H__
+ #define __MLIB_TESTS_TEST_TOTM_H__
+ 
+-#include <boost/version.hpp>
++#include <mlib/tech.h>
+ 
+ //
+ // for Boost > 1.33 dynamic version begin to be built
+ // 
+-#if BOOST_VERSION / 100 % 1000 > 33
++#if BOOST_MINOR_VERSION > 33
+ #   ifndef STILL_HAVE_STATIC_BOOST_WITH_MAIN
+ #       define BOOST_TEST_DYN_LINK 
+ #   endif
+diff --git a/tools/scripts/BuildVars.py b/tools/scripts/BuildVars.py
+index fe992e4..59408ac 100644
+--- a/tools/scripts/BuildVars.py
++++ b/tools/scripts/BuildVars.py
+@@ -458,12 +458,12 @@ def MakeIncludeOptions(dir_list, to_convert=0):
+ 
+ def MoveIncludeOptions(dict):
+     if 'CPPPATH' in dict.keys():
+-        dict['CPP_POST_FLAGS'] = MakeIncludeOptions(dict['CPPPATH'])
++        dict['POST_CPPINCFLAGS'] = MakeIncludeOptions(dict['CPPPATH'])
+         del dict['CPPPATH']
+ 
+ def GetDict(name):
+     dict = UserOptDict[MakeDictName(name)]
+-    #reduce SCons' C scanner area, CPPPATH -> CPP_POST_FLAGS
++    #reduce SCons' C scanner area, CPPPATH -> POST_CPPINCFLAGS
+     if IsToBuildQuick():
+         MoveIncludeOptions(dict)
+     return dict
+@@ -499,6 +499,9 @@ def IsToBuildQuick():
+ 
+     return res
+ 
++def ExtendEnvVariable(env, name, add_name):
++    env[name] = '%s $%s' % (env[name], add_name)
++
+ def CreateEnvVersion2(**kw):
+     tools = ['default', 'AuxTools']
+     if kw.has_key('tools'):
+@@ -514,6 +517,12 @@ def CreateEnvVersion2(**kw):
+         # thin archives ('T' option) are to speed up static libraries build
+         # :TRICKY: libmpeg2.a and etc have to be built directly to build/lib (withour copying/symlinking)
+         env.Replace(ARFLAGS = str(env['ARFLAGS']) + 'T')
++
++    # User defines
++    # it is cosmetically better to place POST_CPPFLAGS just after _CPPDEFFLAGS
++    # but 1) extending _CPPDEFFLAGS is bad such way 2) it still works 
++    ExtendEnvVariable(env, '_CCCOMCOM', 'POST_CPPFLAGS')
++
+     return env
+ 
+ def MakeMainEnv():
+@@ -562,8 +571,9 @@ def MakeMainEnv():
+         suffix = '.pch' if is_clang else '.gch'
+         env['GCHSUFFIX'] = suffix
+     
+-        # 2 - reduce SCons' C scanner area, CPPPATH -> CPP_POST_FLAGS
+-        env['_CPPINCFLAGS'] = env['_CPPINCFLAGS'] + ' $CPP_POST_FLAGS'
++        # 2 - reduce SCons' C scanner area, CPPPATH -> POST_CPPINCFLAGS
++        #env['_CPPINCFLAGS'] = env['_CPPINCFLAGS'] + ' $POST_CPPINCFLAGS'
++        ExtendEnvVariable(env, '_CPPINCFLAGS', 'POST_CPPINCFLAGS')
+     else:
+         def SetPCH(env, header_name, additional_envs=[]):
+             pass