summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini <ponce@slackbuilds.org>2012-09-13 18:48:38 +0200
committer Matteo Bernardini <ponce@slackbuilds.org>2012-09-14 08:12:03 +0200
commit1c1518a6b22b516423a0c18a6cf665fa59578805 (patch)
tree7afd28d9dd8af6c426055de719232275f937f563
parent3281b7504f99ff82a1f22cece6003bafde479fb4 (diff)
downloadslackbuilds-1c1518a6b22b516423a0c18a6cf665fa59578805.tar.gz
slackbuilds-1c1518a6b22b516423a0c18a6cf665fa59578805.tar.xz
multimedia/oggvideotools: Added a patch for gcc-4.7.x
Also fixed library installation path. Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--multimedia/oggvideotools/gcc47.patch11
-rw-r--r--multimedia/oggvideotools/oggvideotools.SlackBuild9
2 files changed, 18 insertions, 2 deletions
diff --git a/multimedia/oggvideotools/gcc47.patch b/multimedia/oggvideotools/gcc47.patch
new file mode 100644
index 0000000000..c3d61b16bd
--- /dev/null
+++ b/multimedia/oggvideotools/gcc47.patch
@@ -0,0 +1,11 @@
+diff -Naur oggvideotools-0.8a.orig/src/fileRepository.h oggvideotools-0.8a/src/fileRepository.h
+--- oggvideotools-0.8a.orig/src/fileRepository.h 2010-05-30 21:11:10.000000000 +0200
++++ oggvideotools-0.8a/src/fileRepository.h 2012-09-13 16:42:11.550012490 +0200
+@@ -23,6 +23,7 @@
+ #define FILEREPOSITORY_H_
+
+ #include <stdio.h>
++#include <unistd.h>
+
+ #include "definition.h"
+ #include "mediaRepository.h"
diff --git a/multimedia/oggvideotools/oggvideotools.SlackBuild b/multimedia/oggvideotools/oggvideotools.SlackBuild
index 1fe3e8e853..3bb6248793 100644
--- a/multimedia/oggvideotools/oggvideotools.SlackBuild
+++ b/multimedia/oggvideotools/oggvideotools.SlackBuild
@@ -70,6 +70,12 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix for gcc-4.7.x
+patch -p1 < $CWD/gcc47.patch
+
+# Fix library installation path
+sed -i "s|DESTINATION\ lib|DESTINATION lib${LIBDIRSUFFIX}|" src/CMakeLists.txt
+
mkdir build
cd build
CFLAGS="$SLKCFLAGS" \
@@ -78,8 +84,7 @@ cd build
-DCMAKE_INSTALL_PREFIX:STRING="/usr" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE" \
- -DLIB_SUFFIX:STRING="$LIBDIRSUFFIX"
+ -DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE"
make
make DESTDIR=$PKG install/strip
cd -