Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ba47412020b617067b898ea5296080cb6081cb48)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ba47412020b617067b898ea5296080cb6081cb48)
  • Date: Sat, 14 Mar 2015 01:52:15 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

video/dvdauthor/0001-Use-pkg-config-to-find-FriBidi.patch | 34
--------------
video/dvdauthor/0002-Fix-build-with-FriBidi-0.19.x.patch | 15 ------
video/dvdauthor/HISTORY | 5 ++
video/dvdauthor/PRE_BUILD | 3 -
4 files changed, 5 insertions(+), 52 deletions(-)

New commits:
commit ba47412020b617067b898ea5296080cb6081cb48
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dvdauthor: Remove unneeded patches

diff --git a/video/dvdauthor/0001-Use-pkg-config-to-find-FriBidi.patch
b/video/dvdauthor/0001-Use-pkg-config-to-find-FriBidi.patch
deleted file mode 100644
index 61df26a..0000000
--- a/video/dvdauthor/0001-Use-pkg-config-to-find-FriBidi.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index e2433da..431cf51 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -75,14 +75,9 @@ fi
- AC_SUBST(MAGICK_CPPFLAGS)
- AC_SUBST(MAGICK_LIBS)
-
--AC_CHECK_PROGS(FRIBIDICONFIG, [fribidi-config])
--if test -n "$FRIBIDICONFIG"; then
-- FRIBIDI_CPPFLAGS="`$FRIBIDICONFIG --cflags`"
-- FRIBIDI_LIBS="`$FRIBIDICONFIG --libs`"
-- AC_DEFINE(HAVE_FRIBIDI, 1, [Whether FriBiDi is available])
--fi
-+PKG_CHECK_MODULES([FRIBIDI], [fribidi], [AC_DEFINE(HAVE_FRIBIDI, 1,
[Whether FriBiDi is available])])
-
--AC_SUBST(FRIBIDI_CPPFLAGS)
-+AC_SUBST(FRIBIDI_CFLAGS)
- AC_SUBST(FRIBIDI_LIBS)
-
- AC_CHECK_PROGS(FREETYPECONFIG, [freetype-config])
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 41c8520..33cd80f 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -7,7 +7,7 @@ endif
-
- nodist_bin_SCRIPTS = dvddirdel
-
--AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" @XML_CPPFLAGS@
@MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CPPFLAGS@
-+AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" @XML_CPPFLAGS@
@MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@
- AM_CFLAGS = -Wall
-
- dvdauthor_SOURCES = dvdauthor.c dvdauthor.h da-internal.h \
diff --git a/video/dvdauthor/0002-Fix-build-with-FriBidi-0.19.x.patch
b/video/dvdauthor/0002-Fix-build-with-FriBidi-0.19.x.patch
deleted file mode 100644
index c18ea23..0000000
--- a/video/dvdauthor/0002-Fix-build-with-FriBidi-0.19.x.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/subreader.c b/src/subreader.c
-index 01f23e3..6838ea9 100644
---- a/src/subreader.c
-+++ b/src/subreader.c
-@@ -1082,8 +1082,8 @@ subtitle* sub_fribidi (subtitle *sub, int sub_utf8)
- int char_set_num;
- fribidi_boolean log2vis;
- if(flip_hebrew) { // Please fix the indentation someday
-- fribidi_set_mirroring (FRIBIDI_TRUE);
-- fribidi_set_reorder_nsm (FRIBIDI_FALSE);
-+ fribidi_set_mirroring (1);
-+ fribidi_set_reorder_nsm (0);
-
- if( sub_utf8 == 0 ) {
- char_set_num = fribidi_parse_c
diff --git a/video/dvdauthor/HISTORY b/video/dvdauthor/HISTORY
index 28f53b6..2ba7312 100644
--- a/video/dvdauthor/HISTORY
+++ b/video/dvdauthor/HISTORY
@@ -1,3 +1,8 @@
+2015-03-14 Ismael Luceno <ismael AT sourcemage.org>
+ * 0001-Use-pkg-config-to-find-FriBidi.patch: Removed, not needed
+ * 0002-Fix-build-with-FriBidi-0.19.x.patch: Removed, not needed
+ * PRE_BUILD: Removed unneeded patches
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version

diff --git a/video/dvdauthor/PRE_BUILD b/video/dvdauthor/PRE_BUILD
index 47ab0c6..c82739a 100755
--- a/video/dvdauthor/PRE_BUILD
+++ b/video/dvdauthor/PRE_BUILD
@@ -3,7 +3,4 @@ cd $SOURCE_DIRECTORY &&

if [ "$DVDAUTHOR_BRANCH" == "scm" ]; then
./bootstrap
-#else
-# patch -p1 < $SCRIPT_DIRECTORY/0001-Use-pkg-config-to-find-FriBidi.patch
&&
-# patch -p1 < $SCRIPT_DIRECTORY/0002-Fix-build-with-FriBidi-0.19.x.patch
fi



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ba47412020b617067b898ea5296080cb6081cb48), Ismael Luceno, 03/14/2015

Archive powered by MHonArc 2.6.24.

Top of Page