Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ac9c99e8609538ea0a74d1a76b1b094fe53b11be)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ac9c99e8609538ea0a74d1a76b1b094fe53b11be)
  • Date: Wed, 27 Sep 2017 09:58:59 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

graphics-libs/poppler/CONFIGURE | 4 +++-
graphics-libs/poppler/HISTORY | 3 +++
video/mlt/HISTORY | 3 +++
video/mlt/PRE_BUILD | 3 +++
video/mlt/xlocale.patch | 26 ++++++++++++++++++++++++++
5 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit ac9c99e8609538ea0a74d1a76b1b094fe53b11be
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

poppler: un-break build

commit af8b3f1c7dc351c23196e391313bb56763fcd262
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mlt: fix build with current glibc

diff --git a/graphics-libs/poppler/CONFIGURE b/graphics-libs/poppler/CONFIGURE
index 7cf8e27..6a67dec 100755
--- a/graphics-libs/poppler/CONFIGURE
+++ b/graphics-libs/poppler/CONFIGURE
@@ -1,3 +1,5 @@
source $GRIMOIRE/CMAKE_CONFIGURE &&

-[ -n "${XPDF_HEADERS}" ] && persistent_add XPDF_HEADERS
+if [[ -n "${XPDF_HEADERS}" ]]; then
+ persistent_add XPDF_HEADERS
+fi
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index c23c548..c372a6f 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2017-09-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE: un-break for empty XPDF_HEADERS
+
2017-09-26 Pavel Vinogradov <public AT sourcemage.org>
* BUILD, DEPENDS: moved tests flags to their respectful dependencies,
some cleanup
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index 0bd4fb9..b956d45 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,6 @@
+2017-09-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, xlocale.patch: fix build with current glibc
+
2016-11-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 6.4.1

diff --git a/video/mlt/PRE_BUILD b/video/mlt/PRE_BUILD
new file mode 100755
index 0000000..e6fb423
--- /dev/null
+++ b/video/mlt/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SCRIPT_DIRECTORY/xlocale.patch"
diff --git a/video/mlt/xlocale.patch b/video/mlt/xlocale.patch
new file mode 100644
index 0000000..ee3dcc3
--- /dev/null
+++ b/video/mlt/xlocale.patch
@@ -0,0 +1,26 @@
+diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
+index 404d513f..043f530b 100644
+--- a/src/framework/mlt_property.h
++++ b/src/framework/mlt_property.h
+@@ -3,7 +3,7 @@
+ * \brief Property class declaration
+ * \see mlt_property_s
+ *
+- * Copyright (C) 2003-2014 Meltytech, LLC
++ * Copyright (C) 2003-2017 Meltytech, LLC
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+@@ -31,7 +31,11 @@
+ #endif
+
+ #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >=
900506)
+-#include <xlocale.h>
++# if __GLIBC_MINOR__ >= 26 && !defined(__APPLE__)
++# include <locale.h>
++# else
++# include <xlocale.h>
++# endif
+ #else
+ typedef char* locale_t;
+ #endif



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ac9c99e8609538ea0a74d1a76b1b094fe53b11be), Thomas Orgis, 09/27/2017

Archive powered by MHonArc 2.6.24.

Top of Page