Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (c26568c7cf486c569d7af5ab9e112c39cf4ef711)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (c26568c7cf486c569d7af5ab9e112c39cf4ef711)
  • Date: Sun, 19 Jan 2014 11:30:30 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

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/BUILD | 7 ++
video/dvdauthor/CONFIGURE | 5 ++
video/dvdauthor/DEPENDS | 17 ++++---
video/dvdauthor/DETAILS | 17 ++++++-
video/dvdauthor/HISTORY | 8 +++
video/dvdauthor/PREPARE | 2
video/dvdauthor/PRE_BUILD | 9 +++
9 files changed, 106 insertions(+), 8 deletions(-)

New commits:
commit c26568c7cf486c569d7af5ab9e112c39cf4ef711
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

dvdauthor: updated to 0.7.1 and added scm build option

diff --git a/video/dvdauthor/0001-Use-pkg-config-to-find-FriBidi.patch
b/video/dvdauthor/0001-Use-pkg-config-to-find-FriBidi.patch
new file mode 100644
index 0000000..61df26a
--- /dev/null
+++ b/video/dvdauthor/0001-Use-pkg-config-to-find-FriBidi.patch
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 0000000..c18ea23
--- /dev/null
+++ b/video/dvdauthor/0002-Fix-build-with-FriBidi-0.19.x.patch
@@ -0,0 +1,15 @@
+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/BUILD b/video/dvdauthor/BUILD
new file mode 100755
index 0000000..716157c
--- /dev/null
+++ b/video/dvdauthor/BUILD
@@ -0,0 +1,7 @@
+if [ "$DVDAUTHOR_FORMAT" != "NONE" ]; then
+ OPTS="--enable-default-video-format=$DVDAUTHOR_FORMAT $OPTS"
+fi &&
+
+OPTS="$DVDAUTHOR_LOCALE $OPTS" &&
+
+default_build
diff --git a/video/dvdauthor/CONFIGURE b/video/dvdauthor/CONFIGURE
new file mode 100755
index 0000000..ed60ba6
--- /dev/null
+++ b/video/dvdauthor/CONFIGURE
@@ -0,0 +1,5 @@
+config_query_list DVDAUTHOR_FORMAT "Set default format?" NONE NTSC PAL &&
+
+config_query_option DVDAUTHOR_LOCALE "Use locale encoding for filenames?" n \
+ "--enable-localized-filenames" ""
+
diff --git a/video/dvdauthor/DEPENDS b/video/dvdauthor/DEPENDS
index 5be6985..69e5981 100755
--- a/video/dvdauthor/DEPENDS
+++ b/video/dvdauthor/DEPENDS
@@ -3,17 +3,22 @@ depends tiff &&
depends JPEG &&
depends zlib &&
depends libxml2 &&
-depends libdvdread &&
+
+
+optional_depends libdvdread \
+ "" \
+ "--disable-dvdunauthor" \
+ "Build dvdunauthor?" &&

optional_depends freetype2 \
"" \
"" \
- "freetype support" &&
+ "freetype support" &&

-optional_depends fribidi \
- "" \
- "" \
- "bidireectional language support" &&
+optional_depends fribidi \
+ "" \
+ "" \
+ "bidireectional language support" &&

optional_depends imagemagick \
"" \
diff --git a/video/dvdauthor/DETAILS b/video/dvdauthor/DETAILS
index c13fe7a..e70e851 100755
--- a/video/dvdauthor/DETAILS
+++ b/video/dvdauthor/DETAILS
@@ -1,9 +1,22 @@
SPELL=dvdauthor
- VERSION=0.7.0
+if [ "$DVDAUTHOR_BRANCH" == "scm" ]; then
+ if [ "$DVDAUTHOR_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=git
+ fi
+ SOURCE=$SPELL-git.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+ SOURCE_URL[0]=git://github.com/ldo/dvdauthor
+ FORCE_DOWNLOAD=on
+ SOURCE_IGNORE=volatile
+else
+ VERSION=0.7.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-
SOURCE_HASH=sha512:2f450ef02dac774a8611f3398f71a8d9d4f7ebb3c9de56ec1c4ec2d54350f371bf32387f95bc90dcd399618819f46cd589cacfef6f7aae68ee3addda5e9ce892
+
SOURCE_HASH=sha512:0875300df4711bf5758cb8a3ec03793689abd403cdebfc5736463d9b6df49a22e66e9e1f0c2abfcb7d25469c2e7f7e76789f7779cc0743ec972f8965b0f744a9
+fi
WEB_SITE=http://dvdauthor.sourceforge.net/
ENTERED=20030921
LICENSE[0]=GPL
diff --git a/video/dvdauthor/HISTORY b/video/dvdauthor/HISTORY
index 1017ab4..4d4798a 100644
--- a/video/dvdauthor/HISTORY
+++ b/video/dvdauthor/HISTORY
@@ -1,3 +1,11 @@
+2013-01-15 Robin Cook <rcook AT wyrms.net>
+ * PREPARE: added for option for scm build
+ * DETAILS: updated to 0.7.1 and anded for scm build
+ * CONFIGURE: added new configure options
+ * DEPENDS: changed libdvdread to optional
+ * PRE_BUILD: added scm build steps and removed patches
+ * BUILD: apply new configure options
+
2011-09-12 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.7.0 (fixed SOURCE_DIRECTORY)

diff --git a/video/dvdauthor/PREPARE b/video/dvdauthor/PREPARE
new file mode 100755
index 0000000..98d27e4
--- /dev/null
+++ b/video/dvdauthor/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/video/dvdauthor/PRE_BUILD b/video/dvdauthor/PRE_BUILD
new file mode 100755
index 0000000..47ab0c6
--- /dev/null
+++ b/video/dvdauthor/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+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




Archive powered by MHonArc 2.6.24.

Top of Page