From 5f68bffa47abd6b002a26ff1335acf3a14e3feb9 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Mon, 13 May 2013 00:32:46 -0400
Subject: [PATCH] =?utf8?q?Ajout=20p7zip=20et=20libx264,=20mise=20=C3=A0=20?=
 =?utf8?q?jour=20ffmpeg=20et=20ack?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 config/packages-list   | 7 +++++--
 stage3/hv-install-1    | 3 +++
 stage3/packages-update | 2 ++
 stage3/pkg/p7zip       | 7 +++++++
 stage5/pkg/ffmpeg      | 4 +++-
 5 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 stage3/pkg/p7zip

diff --git a/config/packages-list b/config/packages-list
index 8542cec..cce03e1 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -4,7 +4,7 @@
 # as well the corresponding patches, if needed.
 
 ABIWORD="abiword-2.8.6"
-ACK="ack-1.94"
+ACK="ack-2.02"
 ACPID="acpid-2.0.9"
 AGG="agg-2.5"
 ALSA_LIB="alsa-lib-1.0.25"
@@ -84,7 +84,7 @@ EXPAT="expat-2.1.0"
 
 FCRON="fcron-3.0.6"
 FETCHMAIL="fetchmail-6.3.21"
-FFMPEG="ffmpeg-0.11.1"
+FFMPEG="ffmpeg-1.2"
 FFTW="fftw-3.3.2"
 FIREFOX="firefox-15.0.1"
 FILE_PKG="file-5.11"
@@ -245,6 +245,7 @@ LIBWNCK="libwnck-2.30.7"
 LIBXKLAVIER="libxklavier-5.2.1"
 LIBXML2="libxml2-2.8.0"
 LIBXSLT="libxslt-1.1.26"
+LIBX264="x264-snapshot-20130416-2245"
 LILYPOND="lilypond-2.16.2"
 LLVM="llvm-3.1"
 LTSP_UTILS="ltsp-utils-0.25-0"
@@ -440,3 +441,5 @@ YASM="yasm-1.2.0"
 
 ZIP="zip-3.0"
 ZLIB="zlib-1.2.7"
+
+P7ZIP="p7zip_9.20.1_src_all"
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 2071f93..69a8de0 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -72,6 +72,7 @@ ipkg -m acnb ${MYSQL}
 ipkg -m noac ${ZIP}
 ipkg -m noac ${UNZIP}
 ipkg -m noac ${UNRAR}
+ipkg -m noac ${P7ZIP}
 ipkg ${CPIO} "\
     --bindir=/bin \
     --libexecdir=/tmp \
@@ -197,6 +198,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg ${LIBTHEORA}
         ipkg ${XVIDCORE}
 
+        ipkg ${LIBX264} "--enable-shared"
+
         # Audio libraries
 	ipkg -m acnb ${AUDIOFILE}
         ipkg ${PORTAUDIO}
diff --git a/stage3/packages-update b/stage3/packages-update
index dc98d11..e68143d 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -62,6 +62,7 @@ fpkg -f "unzip$(get_pkg_ver ${UNZIP} | sed 's!\.!!g')" -s "infozip" \
     -e "tar.gz" ${UNZIP} ${SOURCEFORGE_URL}
 fpkg -f "unrarsrc-$(get_pkg_ver ${UNRAR})" -e "tar.gz" ${UNRAR} \
     "http://www.rarlab.com/rar"
+fpkg -m sf -s "p7zip" ${P7ZIP}
 fpkg -m gnu ${CPIO}
 fpkg -m gnu ${SCREEN}
 
@@ -180,6 +181,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         fpkg ${LIBFAAD2} "http://downloads.sourceforge.net/faac"
         fpkg ${LIBTHEORA} "http://downloads.xiph.org/releases/theora"
         fpkg ${XVIDCORE} "http://downloads.xvid.org/downloads"
+        fpkg ${LIBX264} "ftp://ftp.videolan.org/pub/videolan/x264/snapshots"
 
         fpkg -e "tar.gz" ${AUDIOFILE} "http://www.68k.org/~michael/audiofile"
         fpkg -e "tgz" ${PORTAUDIO} "http://www.portaudio.com/archives"
diff --git a/stage3/pkg/p7zip b/stage3/pkg/p7zip
new file mode 100644
index 0000000..9821a3f
--- /dev/null
+++ b/stage3/pkg/p7zip
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+hvbuild()
+{
+    ${HVMAKE}
+    ${HVMAKE} -n DEST_HOME=/usr install
+}
diff --git a/stage5/pkg/ffmpeg b/stage5/pkg/ffmpeg
index c2ab697..f311f39 100644
--- a/stage5/pkg/ffmpeg
+++ b/stage5/pkg/ffmpeg
@@ -14,5 +14,7 @@ hvconfig_pre()
         --enable-libmp3lame \
         --enable-libtheora \
         --enable-libvorbis \
-        --enable-libxvid"
+        --enable-libxvid \
+        --enable-libfreetype \
+        --enable-libx264"
 }
-- 
2.20.1