Skip to Content.
Sympa Menu

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

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 (4345a6b2ed338f2a65849483a644dad4c3a94335)
  • Date: Wed, 14 Apr 2010 10:10:12 -0500

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

video/subrip/BUILD | 3 +--
video/subrip/HISTORY | 7 +++++++
video/subrip/PRE_BUILD | 4 ++++
video/subrip/subtitleripper-0.3.4-glibc210.patch | 21 +++++++++++++++++++++
4 files changed, 33 insertions(+), 2 deletions(-)

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

video/subrip: added patch from gentoo to make the spell compile with
glibc 2.10

diff --git a/video/subrip/BUILD b/video/subrip/BUILD
index 43bd610..6dfecc1 100755
--- a/video/subrip/BUILD
+++ b/video/subrip/BUILD
@@ -1,2 +1 @@
-cp $SCRIPT_DIRECTORY/Makefile $SOURCE_DIRECTORY &&
-make
+default_build_make
diff --git a/video/subrip/HISTORY b/video/subrip/HISTORY
index 4c62396..99de17b 100644
--- a/video/subrip/HISTORY
+++ b/video/subrip/HISTORY
@@ -1,3 +1,10 @@
+2010-04-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, PRE_BUILD, subtitleripper-0.3.4-glibc210.patch:
+ added patch from gentoo to make the spell compile with
+ glibc 2.10, moved copying of the Makefile from BUILD to
+ PRE_BUILD
+ * BUILD: use default_build_make
+
2006-06-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: Updated to 0.3-4

diff --git a/video/subrip/PRE_BUILD b/video/subrip/PRE_BUILD
new file mode 100755
index 0000000..be3d03a
--- /dev/null
+++ b/video/subrip/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/subtitleripper-0.3.4-glibc210.patch &&
+cp $SCRIPT_DIRECTORY/Makefile $SOURCE_DIRECTORY
diff --git a/video/subrip/subtitleripper-0.3.4-glibc210.patch
b/video/subrip/subtitleripper-0.3.4-glibc210.patch
new file mode 100644
index 0000000..8dc2b24
--- /dev/null
+++ b/video/subrip/subtitleripper-0.3.4-glibc210.patch
@@ -0,0 +1,21 @@
+diff -Naurp subtitleripper-orig/vobsub.c subtitleripper/vobsub.c
+--- subtitleripper-orig/vobsub.c 2003-12-08 03:28:02.000000000 -0600
++++ subtitleripper/vobsub.c 2009-05-30 19:09:13.266973499 -0600
+@@ -56,7 +56,7 @@ extern ssize_t getline(char **, size_t *
+ /* FIXME This should go into a general purpose library or even a
+ separate file. */
+ static ssize_t
+-getline (char **lineptr, size_t *n, FILE *stream)
++get_line (char **lineptr, size_t *n, FILE *stream)
+ {
+ size_t res = 0;
+ int c;
+@@ -753,7 +753,7 @@ vobsub_parse_one_line(vobsub_t *vob, FIL
+ do {
+ size_t line_reserve = 0;
+ char *line = NULL;
+- line_size = getline(&line, &line_reserve, fd);
++ line_size = get_line(&line, &line_reserve, fd);
+ if (line_size < 0) {
+ if (line)
+ free(line);



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4345a6b2ed338f2a65849483a644dad4c3a94335), Florian Franzmann, 04/14/2010

Archive powered by MHonArc 2.6.24.

Top of Page