Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (8137c1adb4c4474c16ae525a621309c720b5d065)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (8137c1adb4c4474c16ae525a621309c720b5d065)
  • Date: Tue, 16 Oct 2012 16:08:58 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

security-libs/linux-pam/HISTORY | 6 +++---
utils/strigi/HISTORY | 7 +++++--
utils/strigi/PRE_BUILD | 3 ++-
3 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 8137c1adb4c4474c16ae525a621309c720b5d065
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

linux-pam: Cleanup formatting

commit ca0bf2d09457ff6f826acd0e9eebe4f94c157605
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

strigi: Cleanup formatting

commit f957d5b5be2686d301e02b65e027ae528a3d24e8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

strigi: Apply strigi-0.7.7-ffmpeg-0.11.patch for ffmpeg 1.0+ as well

diff --git a/security-libs/linux-pam/HISTORY b/security-libs/linux-pam/HISTORY
index d3f67f8..2215f18 100644
--- a/security-libs/linux-pam/HISTORY
+++ b/security-libs/linux-pam/HISTORY
@@ -4,10 +4,10 @@

2012-07-07 Sukneet Basuta <sukneet AT sourcemage.org>
* CONFIGURE: remove config_query for SELINUX
- * DEPENDS: switch to optional_depends for selinux to pass proper
flags
- * INSTALL: fix commented out check for libselinux in case
+ * DEPENDS: switch to optional_depends for selinux to pass proper flags
+ * INSTALL: fix commented out check for libselinux in case
someone needs it
-
+
2011-12-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.5, SECURITY_PATCH=3
http://www.redhat.com/archives/pam-list/2011-October/msg00019.html
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index e0daa0e..47da754 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,6 @@
+2012-10-16 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply strigi-0.7.7-ffmpeg-0.11.patch for ffmpeg 1.0+ as
well
+
2012-07-23 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: changed depends clucene to optional_depends, with
sub_depends
stable
@@ -13,11 +16,11 @@
added patch to fix building on gcc 4.7
if ffmpeg >= 0.11 is enabled, apply patch to fix build with it
* 0001-fix-build-for-disabled-qt4-option.patch: removed, no longer
needed
- * strigi-0.7.7-gcc47.patch: added, fixes build with gcc 4.7
+ * strigi-0.7.7-gcc47.patch: added, fixes build with gcc 4.7
* strigi-0.7.7-ffmpeg-0.11.patch: added, fixes build with ffmpeg >=
0.11

2012-02-08 Tommy Boatman <tboatman AT sourcemage.org>
- * DEPENDS: ffmpeg optional but currently broken, so option is
+ * DEPENDS: ffmpeg optional but currently broken, so option is
disabled either way

2011-08-31 Bor Kraljič <pyrobor AT ver.si>
diff --git a/utils/strigi/PRE_BUILD b/utils/strigi/PRE_BUILD
index ee8c21a..d90b136 100755
--- a/utils/strigi/PRE_BUILD
+++ b/utils/strigi/PRE_BUILD
@@ -7,6 +7,7 @@ FFMPEG_VER=0
if is_depends_enabled $SPELL ffmpeg; then
FFMPEG_VER=$(installed_version ffmpeg|cut -d. -f2)
fi
-if (( $FFMPEG_VER >= 11 )) || is_depends_enabled $SPELL ffmpeg-svn; then
+if (( $FFMPEG_VER >= 11 || $(installed_version ffmpeg|cut -d. -f1) >= 1)) ||
is_depends_enabled $SPELL ffmpeg-svn; then
+ message "${MESSAGE_COLOR}Patching for ffmpeg 0.11+ API...${DEFAULT_COLOR}"
&&
patch -p1 < $SPELL_DIRECTORY/strigi-0.7.7-ffmpeg-0.11.patch
fi



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (8137c1adb4c4474c16ae525a621309c720b5d065), Eric Sandall, 10/16/2012

Archive powered by MHonArc 2.6.24.

Top of Page