Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (fb1bccc66db233e4e2ae0d2bdecfb292a739b2ee)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (fb1bccc66db233e4e2ae0d2bdecfb292a739b2ee)
  • Date: Wed, 16 Feb 2011 14:50:41 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

video/dvbcut/HISTORY | 4 ++++
video/dvbcut/PRE_BUILD | 5 +++--
video/dvbcut/gcc-4.5.diff | 22 ++++++++++++++++++++++
3 files changed, 29 insertions(+), 2 deletions(-)

New commits:
commit ff76a04892896b9fc5cb3b3358dac4f038dc45e4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/dvbcut: fixed compile error with gcc 4.5

diff --git a/video/dvbcut/HISTORY b/video/dvbcut/HISTORY
index 8880d8c..fda19c5 100644
--- a/video/dvbcut/HISTORY
+++ b/video/dvbcut/HISTORY
@@ -1,3 +1,7 @@
+2011-02-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, gcc-4.5.diff: added patch to fix compile error with
+ gcc 4.5
+
2011-01-02 Ismael Luceno <ismael AT sourcemage.org>
* dvbcut.desktop: added spanish comment

diff --git a/video/dvbcut/PRE_BUILD b/video/dvbcut/PRE_BUILD
index c6d7771..b553e9f 100755
--- a/video/dvbcut/PRE_BUILD
+++ b/video/dvbcut/PRE_BUILD
@@ -1,3 +1,4 @@
-default_pre_build &&
+default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.4.diff
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.4.diff &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.5.diff
diff --git a/video/dvbcut/gcc-4.5.diff b/video/dvbcut/gcc-4.5.diff
new file mode 100644
index 0000000..c2aa6a7
--- /dev/null
+++ b/video/dvbcut/gcc-4.5.diff
@@ -0,0 +1,22 @@
+--- dvbcut-0.6.0/src/main.cpp.orig 2011-02-16 21:39:05.229170751 +0100
++++ dvbcut-0.6.0/src/main.cpp 2011-02-16 21:40:07.274329059 +0100
+@@ -171,7 +171,7 @@
+ return 1;
+ }
+
+- index::index idx(*mpg);
++ class index idx(*mpg);
+ int pics = idx.generate();
+ if (pics <= 0) {
+ fprintf(stderr, "%s: %s: %s\n", argv0, mpgfilename.c_str(),
+--- dvbcut-0.6.0/src/mpgfile.h.orig 2011-02-16 21:42:36.353918944 +0100
++++ dvbcut-0.6.0/src/mpgfile.h 2011-02-16 21:40:36.253804316 +0100
+@@ -49,7 +49,7 @@
+ stream s[MAXAVSTREAMS];
+ int videostreams, audiostreams;
+ int initialoffset;
+- index::index idx;
++ class index idx;
+ int pictures;
+
+ mpgfile(inbuffer &b, int initial_offset);



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (fb1bccc66db233e4e2ae0d2bdecfb292a739b2ee), Florian Franzmann, 02/16/2011

Archive powered by MHonArc 2.6.24.

Top of Page