-Ramené GStreamer au stage5

-Installé VLC avec Qt et lua (mais seulement le son fonctionne)

diff --git a/config/dependencies b/config/dependencies
index f04b31a..710c58f 100644 (file)
--- a/config/dependencies
+++ b/config/dependencies
@@ -127,3 +127,5 @@ ${GNUPG}: ${OPENLDAP} ${LIBUSB_COMPAT} ${MTA}
 ${MUTT}: ${GNUPG} ${OPENSSL} ${MTA} ${KERBEROS5} ${SASL2}
 
 ${TRASMISSION}: ${LIBEVENT}
+
+${VLC}: ${QT} ${LUA} ${FIREFOX}

diff --git a/config/packages-list b/config/packages-list
index a852977..3ba4ced 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -198,12 +198,12 @@ GRIP="grip-3.3.1"
 GROFF="groff-1.20.1"
 GRUB="grub-1.99"
 GSL="gsl-1.15"
-GSTREAMER="gstreamer-0.10.20"
-GST_PLUGINS_BASE="gst-plugins-base-0.10.20"
-GST_PLUGINS_GOOD="gst-plugins-good-0.10.10"
-GST_PLUGINS_BAD="gst-plugins-bad-0.10.8"
-GST_PLUGINS_UGLY="gst-plugins-ugly-0.10.10"
-GST_FFMPEG="gst-ffmpeg-0.10.6"
+GSTREAMER="gstreamer-0.10.35"
+GST_PLUGINS_BASE="gst-plugins-base-0.10.35"
+GST_PLUGINS_GOOD="gst-plugins-good-0.10.30"
+GST_PLUGINS_BAD="gst-plugins-bad-0.10.22"
+GST_PLUGINS_UGLY="gst-plugins-ugly-0.10.18"
+GST_FFMPEG="gst-ffmpeg-0.10.12"
 GDK_PIXBUF="gdk-pixbuf-2.22.1"
 GTK="gtk+-2.24.4"
 GTK_ENGINES="gtk-engines-2.20.2"
@@ -293,6 +293,7 @@ LIBXML2="libxml2-2.7.7"
 LIBXSLT="libxslt-1.1.26"
 LILYPOND="lilypond-2.14.2"
 LTSP_UTILS="ltsp-utils-0.25-0"
+LUA="lua-5.1.4"
 LYNX="lynx2.8.7rel.2"
 
 MAKE_PACKAGE="make-3.82"
@@ -302,7 +303,6 @@ METACITY="metacity-2.18.5"
 MFOUR="m4-1.4.15"
 MILTER_GREYLIST="milter-greylist-4.0"
 MILTER_SPF="smf-spf-2.0.1"
-MM_COMMON="mm-common-0.9.5"
 MOC="moc-2.4.4"
 MODULE_INIT_TOOLS="module-init-tools-3.12"
 MPC="mpc-0.8.2"
@@ -366,6 +366,8 @@ PYGOBJECT="pygobject-2.28.4"
 PYGTK="pygtk-2.24.0"
 PYTHON="Python-2.6.4"
 
+QT="qt-everywhere-opensource-src-4.7.1"
+
 READLINE="readline-6.1"
 REISERFSPROGS="reiserfsprogs-3.6.21"
 RHYTHMBOX="rhythmbox-0.10.1"
@@ -427,6 +429,7 @@ USBUTILS="usbutils-0.86"
 UTIL_LINUX="util-linux-2.19"
 UW_IMAP="imap-2007e"
 
+VLC="vlc-1.1.11"
 VORBIS_TOOLS="vorbis-tools-1.1.1"
 
 WGET="wget-1.11.4"

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 3b51c86..2e646ff 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -104,6 +104,13 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg ${LILYPOND} "--disable-documentation --disable-debugging"
 
         ipkg ${FFMPEG}
+
+        ipkg ${GSTREAMER}
+        ipkg ${GST_PLUGINS_BASE}
+        ipkg ${GST_PLUGINS_GOOD}
+        ipkg ${GST_PLUGINS_BAD}
+        ipkg ${GST_PLUGINS_UGLY}
+        ipkg -m acnb ${GST_FFMPEG}
     fi
 
     ipkg ${SYLPHEED} "--enable-ssl --enable-ldap"
@@ -111,8 +118,11 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg ${YASM}
     ipkg -m noac ${FIREFOX}
 
-    # VLC
-    #./configure --prefix=/usr --sysconfdir=/etc  --disable-lua --disable-qt4 --disable-skins2 --enable-mozilla
+    ipkg -s qt ${QT}
+    ipkg -m noac ${LUA}
+    ##ipkg ${VLC} "--enable-mozilla"
+    ipkg -m acnb ${VLC} "--disable-mozilla"
+
     ####ipkg ${GNASH}
     # GtkGLExt gstreamer SDL xulrunner
 fi

diff --git a/stage5/packages-update b/stage5/packages-update
index a162f68..3ecfbcb 100755 (executable)
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -93,6 +93,12 @@ fpkg -m sf -e "tar.bz2" -s "fontforge/fontforge-source" ${FONTFORGE}
 fpkg -e "tar.gz" ${LILYPOND} \
     "http://lilypond.org/download/sources/v$(get_pkg_ver2 ${LILYPOND})"
 fpkg ${FFMPEG} "http://www.ffmpeg.org/releases"
+fpkg -m gnome ${GSTREAMER}
+fpkg -m gnome ${GST_PLUGINS_BASE}
+fpkg -m fd -o "gstreamer" -s "src/gst-plugins-good" ${GST_PLUGINS_GOOD}
+fpkg -m fd -o "gstreamer" -s "src/gst-plugins-bad"  ${GST_PLUGINS_BAD}
+fpkg -m fd -o "gstreamer" -s "src/gst-plugins-ugly" ${GST_PLUGINS_UGLY}
+fpkg -m fd -o "gstreamer" -s "src/gst-ffmpeg"       ${GST_FFMPEG}
 
 fpkg ${SYLPHEED} \
     "http://sylpheed.good-day.net/sylpheed/v$(get_pkg_ver2 ${SYLPHEED})"
@@ -101,6 +107,10 @@ fpkg ${LIBNOTIFY} \
 fpkg ${YASM} "http://www.tortall.net/projects/yasm/releases" 
 fpkg -f "${FIREFOX}.source" ${FIREFOX} \
     "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(get_pkg_ver ${FIREFOX})/source"
+
+fpkg -e "tar.gz" ${QT} "http://get.qt.nokia.com/qt/source"
+fpkg -e "tar.gz" ${LUA} "http://www.lua.org/ftp"
+fpkg -e "tar.bz2" -m sf ${VLC}
 fpkg ${GNASH} "http://ftp.gnu.org/pub/gnu/gnash/$(get_pkg_ver ${GNASH})"
 
 fpkg -e "tar.gz" ${LIBSPF2} "http://libspf2.org/spf"

diff --git a/stage5/pkg/lua b/stage5/pkg/lua
new file mode 100644 (file)
index 0000000..ab76ab1
--- /dev/null
+++ b/stage5/pkg/lua
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+hvbuild()
+{
+    cd ${LFS_TMP}/${PACKAGE}
+    make CPPFLAGS="-fPIC" linux
+    make INSTALL_TOP=/usr install
+}
+
+hvbuild_post()
+{
+    sed -i 's@/usr/local@/usr@g' etc/lua.pc
+    cp etc/lua.pc /usr/lib/pkgconfig
+    cp etc/lua.ico /usr/share/icons
+}

diff --git a/stage5/pkg/qt b/stage5/pkg/qt
new file mode 100644 (file)
index 0000000..0bbcc03
--- /dev/null
+++ b/stage5/pkg/qt
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+hvconfig_pre()
+{
+    CONFIGURE_OPTS="\
+        -prefix /opt/qt \
+        -opensource \
+        -nomake examples \
+        -nomake demos"
+}
+
+hvbuild_post()
+{
+    # Addition to /etc/ld.so.conf
+    string_add "/opt/qt/lib" /etc/ld.so.conf
+
+    var_add_path "PKG_CONFIG_PATH" /etc/profile "/opt/qt/lib/pkgconfig"
+    var_export   "PKG_CONFIG_PATH" /etc/profile
+}

diff --git a/stage6/packages-update b/stage6/packages-update
index cc1620e..0ae48ee 100755 (executable)
--- a/stage6/packages-update
+++ b/stage6/packages-update
@@ -61,12 +61,6 @@ fpkg -m gnome ${GCONF_EDITOR}
 fpkg -m gnome ${GNOME_UTILS}
 fpkg -m gnome ${GNOME_SYSTEM_MONITOR}
 fpkg -m gnome ${NAUTILUS_CD_BURNER}
-fpkg -m gnome ${GSTREAMER}
-fpkg -m gnome ${GST_PLUGINS_BASE}
-fpkg -m fd -o "gstreamer" -s "src/gst-plugins-good" ${GST_PLUGINS_GOOD}
-fpkg -m fd -o "gstreamer" -s "src/gst-plugins-bad"  ${GST_PLUGINS_BAD}
-fpkg -m fd -o "gstreamer" -s "src/gst-plugins-ugly" ${GST_PLUGINS_UGLY}
-fpkg -m fd -o "gstreamer" -s "src/gst-ffmpeg"       ${GST_FFMPEG}
 fpkg -m gnome ${GNOME_MEDIA}
 fpkg -m gnome ${GNOME_NETSTATUS}
 fpkg -m gnome ${GCALCTOOL}