From 48501fb37dd46c2e9f6f016dd987b13e61dd476a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 17 May 2013 12:54:59 +0100
Subject: Add verbatim stack.{cpp,hpp} from mr-edd.co.uk hg repo.

---
 src/lib/wscript | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/lib/wscript')

diff --git a/src/lib/wscript b/src/lib/wscript
index 51b103afd..129b8d9fb 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -50,6 +50,7 @@ sources = """
           util.cc
           video_decoder.cc
           video_source.cc
+          version.cc
           writer.cc
           """
 
@@ -68,7 +69,10 @@ def build(bld):
                  """
     if bld.env.TARGET_WINDOWS:
         obj.uselib += ' WINSOCK2'
-    obj.source = sources + " version.cc"
+        obj.source = sources + ' stack.cpp'
+    else:
+        obj.source = sources
+
     obj.target = 'dvdomatic'
 
     i18n.po_to_mo(os.path.join('src', 'lib'), 'libdvdomatic', bld)
-- 
cgit v1.2.3


From c22c118458b3eafd0b71cf61f9edb33e9770802e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 17 May 2013 13:12:15 +0100
Subject: Fix build.

---
 src/lib/stack.cpp | 10 ++++++++--
 src/lib/wscript   |  2 +-
 wscript           |  3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/lib/wscript')

diff --git a/src/lib/stack.cpp b/src/lib/stack.cpp
index b3479b1bb..24668dfe7 100644
--- a/src/lib/stack.cpp
+++ b/src/lib/stack.cpp
@@ -11,13 +11,15 @@
 #include <stdexcept>
 #include <sstream>
 
-#include "dbg/stack.hpp"
+#include "stack.hpp"
 
 #if defined(_WIN32)
 #   include <windows.h>
 #   include <imagehlp.h>
 
 #   if defined(__MINGW32__)
+#       define PACKAGE 1
+#       define PACKAGE_VERSION 1
 #       include <bfd.h> // link against libbfd and libiberty
 #       include <psapi.h> // link against psapi
 #       include <cxxabi.h>
@@ -192,7 +194,7 @@ namespace
         public:
             explicit windows_dll(const std::string &libname) :
                 name_(libname),
-                lib_(LoadLibrary(name_.c_str()))
+                lib_(LoadLibraryA(name_.c_str()))
             {
                 if (!lib_) throw std::runtime_error("Failed to load dll " + name_);
             }
@@ -329,7 +331,11 @@ namespace
 
                 if (func.empty())
                 {
+#if defined(_WIN64)
+		    DWORD64 dummy = 0;
+#else		    
                     DWORD dummy = 0;
+#endif		    
                     BOOL got_symbol = SymGetSymFromAddr(process, frame.AddrPC.Offset, &dummy, symbol);
                     func = got_symbol ? symbol->Name : unknown_function;
                 }
diff --git a/src/lib/wscript b/src/lib/wscript
index 129b8d9fb..dcf44a7e8 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -68,7 +68,7 @@ def build(bld):
                  SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP GLIB LZMA
                  """
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += ' WINSOCK2'
+        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY'
         obj.source = sources + ' stack.cpp'
     else:
         obj.source = sources
diff --git a/wscript b/wscript
index 51a2ad04d..35a55213e 100644
--- a/wscript
+++ b/wscript
@@ -32,6 +32,9 @@ def configure(conf):
             conf.env.append_value('CXXFLAGS', ['-mconsole'])
             conf.env.append_value('LINKFLAGS', ['-mconsole'])
         conf.check(lib = 'ws2_32', uselib_store = 'WINSOCK2', msg = "Checking for library winsock2")
+        conf.check(lib = 'bfd', uselib_store = 'BFD', msg = "Checking for library bfd")
+        conf.check(lib = 'dbghelp', uselib_store = 'DBGHELP', msg = "Checking for library dbghelp")
+        conf.check(lib = 'iberty', uselib_store = 'IBERTY', msg = "Checking for library iberty")
         boost_lib_suffix = '-mt'
         boost_thread = 'boost_thread_win32-mt'
     else:
-- 
cgit v1.2.3


From c7cde950031d48482a841c987be38b9193bdd08a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 19 May 2013 12:23:15 +0100
Subject: Fix accidentally-broken .pot file building.

---
 src/lib/wscript | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/lib/wscript')

diff --git a/src/lib/wscript b/src/lib/wscript
index dcf44a7e8..253a496d1 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -50,7 +50,6 @@ sources = """
           util.cc
           video_decoder.cc
           video_source.cc
-          version.cc
           writer.cc
           """
 
@@ -67,11 +66,12 @@ def build(bld):
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 
                  SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP GLIB LZMA
                  """
+
+    obj.source = sources + ' version.cc'
+
     if bld.env.TARGET_WINDOWS:
         obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY'
-        obj.source = sources + ' stack.cpp'
-    else:
-        obj.source = sources
+        obj.source += ' stack.cpp'
 
     obj.target = 'dvdomatic'
 
-- 
cgit v1.2.3