From 0ec84670a34dd0828d1391d28d7bc3b2a9069fe6 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>
Date: Tue, 22 Sep 2009 17:46:11 +0000
Subject: vlc: upating to 1.0.2

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2247 370017ae-e619-0410-ac65-c121f96126d4
---
 media/video/vlc/Manifest       | 35 ++++++++++++++++++-----------------
 media/video/vlc/vlc-1.0.2.diff | 12 ++++++++++++
 media/video/vlc/vlc.SlackBuild | 39 ++++++++++++++++++++++++++++++++-------
 3 files changed, 62 insertions(+), 24 deletions(-)
 create mode 100644 media/video/vlc/vlc-1.0.2.diff

diff --git a/media/video/vlc/Manifest b/media/video/vlc/Manifest
index 417041ec..5f64c678 100644
--- a/media/video/vlc/Manifest
+++ b/media/video/vlc/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST vlc-0.9.9a.tar.bz2 17500620 MD5 c8d832deeef7f4072a73506f8d033198 RMD160 c185b5e8dae8e8aacb6e1c03f14eae24cb805648 SHA1 c72a3aa7854292356c0c5149cbb732da7d46b163 SHA256 e5d0a168263f56bccc62d30031287d56f0b6a3447b552f3a5224132d0b597dd6 SHA512 3018579264781286308d44f223f1f5b9425b9ab5f1ad5eb53bc35cf7373b5c327277839ff6432b7cd0220be7a3b38b28b880995ab4a5e5499e84f480216dfd3a
-MKBUILD vlc.mkbuild 3353 MD5 a2da7e177bb09bbb84724377a80f69a3 RMD160 ea65e248bed7e98c8caeaf2fc918bec2eff7fc7f SHA1 fb668bb5ab1102e2d4d15b23a7a3875281c50e4e SHA256 31f874ded768f66f610e74d2c23c5d796e826f2123fede9e46ed4a24bd2172e7 SHA512 f50b1afeb6c0042bc633c2b9425189b9ad5cb7321de9cbef3a1dbc02fa837fdf875f8cba2f1319dc33b8ad8ba82e0a9545dd25608e1c0148104f272962e31a67
+DIST vlc-1.0.2.tar.bz2 20958212 MD5 69d4e30fe4fc2691780fbeacd40359d2 RMD160 36f93339d1947483bb5ef4877cbb4b3ab200b3cd SHA1 5207d227f09d16a44823ae4a8b2144b3ce18eefb SHA256 38b176fd495f3254db74e03977235a0a2212fc6533d7cd1a4c3dddc495b074f0 SHA512 d9125ce36df8d9d88fa66741c4650e696d791f1c5bfeecf996bdd20968f059036ab8827540ccf45d3d61f36a451274ae3c3ff4fb09dc35d5b97e9083a9d43c6f
+MKBUILD vlc.mkbuild 3382 MD5 0597203cf24c7aec3ef74b7765613ffd RMD160 4e06e32cdcfc1279bdbfdb98e8045f3db2372655 SHA1 dff8720643116b558e8f503cfd0b45a460b04284 SHA256 8beb21046093414b35b79dc19c68fab369a7111c76fb15113055d1342dcdbe48 SHA512 e7c08e8003a221d9c168ee4cb25d5a034abbc4487c1e30350797dc8e3b763b61f701157c7856f398f7db7858c9f1509f647b0627c409f6dee669ead67a1ae362
+PATCH vlc-1.0.2.diff 526 MD5 c978f4154bdc9bee4d9ade010cac1b55 RMD160 04472776d0df3640fbf7ff9bc24131fb311c855f SHA1 5420b29dde439baae254bb357f8c81572ec316ab SHA256 58647e3f589aeb5b5c8e6506fcd4930760589b99be4a39e525d8ba374abe9a78 SHA512 c1811873a6c3baf02508c0444191d0b3d8d17721bf0d0acb1ce0b8ec7b83fb4a5cf2e9b162387a1ae64a170392da97047247d9ba789b87bfc465a93f26c8dee0
 SLACK-REQUIRED slack-required 199 MD5 601337aab9356aa1ebc033de416ffe41 RMD160 d76622ccad8da765343690873574e0182d3e7e0a SHA1 1ca4acf1e3c2fe95d05b513b5fe40042cb289352 SHA256 3e9ae6413ed1b6fabc5e56dc8e102ca8580b0f8e098d4cce58c7af1b992fdd89 SHA512 9755759a6a2522106cac440c5507aac40a0241a61aec0ecdb9b17f5b745393ce82e5ac0a7b10c6c6e3484a33dc0013400b2bb282769cce1fcab02771ad372d65
-SLACKBUILD vlc.SlackBuild 7363 MD5 6d71f4b827323d6425f9dc081f2057eb RMD160 dff1e834823651835baa3ae28ffcad6560998e4b SHA1 75ac064807d1e11a10d889df400ea582c05802f2 SHA256 0d3d87b3f523165b94984e6bd79256dd814f5f2d64be04b80336dd2e44bfce51 SHA512 cb6d0b1e157b9f3cf842636624ee4d922b0e1eb4ccdfa8ccf1cae8d29e741b47cf002246ec901f01d920856a65228167bd9cc1b702e77e274ee98cd4bd4a55ee
+SLACKBUILD vlc.SlackBuild 8451 MD5 557dc82c1c7a7c3f93d1216c3551b178 RMD160 b7e30d5806c3e5bf95f30962c807f3864df5cc75 SHA1 98f5cea049b32d376673e91b1d48b31d9fadb771 SHA256 182440ceaee6ef3854d205af10b967deb0affc1b9e517cdd755797fc57f37a5e SHA512 f9cb3dc8cbeb1bf0062dc0ef679086281bee89f46e945d6fcc1e7ccc91b3de67b5877d1f5cf431d8728b1de3d6738a63ff31329d66a8b580fd0db7dbd1fa140a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iQIcBAEBAgAGBQJJ+ysJAAoJEEHL93ESzgeixsEP/0OmZsyi67474XEod8fITlNA
-oDliMHocF8ysZOdDZky/X7DYTkA36UWkjb3gTr0XMljptq3vC3hxg5BdkiCqBqcP
-cBEXONtaFxNobxMQ2Jnp2axluTR66mEuKzs+VXBIlKnb0GdyUcvYRn4FI2vtK1J8
-lwtCkRaLBUCsZgla888kTE4qA0gbbGVexSZoAxF8ajQj0Am7iKNpsFTng+xNry/w
-uyfsFRWnOdSL62+Eb5qTPBeBiWvNFjuRn6UnTJM3qRhMgZXpp26lXEmhRtz2HWtt
-gbDqWZ+0hMDl/L/xlPi01+sa/AzP17r6bSCA3T4c8KGq536xHDBLS/mfyGGUqDqa
-U5c6QmsEwhEup5PNacYz9975nPwFYbMWoRU8jhmrbiP+2OYqRS1uhBlTmw+Z3d4/
-53KsFzncohW5Emv/2AyhpLj5mD5SR7sfzwr+Y1/GY8VgxPdlirrZGrL+sB0DIAHs
-BMmoa4N8Pd4Y2S9TkxR+HUWUa5BbNJMIGRHnjfyx4y5n9w4/Z4/5zRPkb4RQbtQK
-IsFJjjBEUOvF2nc9s+WwhNzQgN+TbwUd7a9b8wBwlDVOMs6jPNUWoP/ciuUORcWI
-8HK3VDBqsCQzZ4CJEaYxNLLdg0ZmTyGRQYCIoHeMLfNXUq5inH/AorB53unSKLiV
-1AJ1mA2zzXcvJOaBmxTo
-=ww+y
+iQIcBAEBCAAGBQJKuQU/AAoJEEHL93ESzgei34oQAKxqlP8ddUZwvM8BRQgagC3S
+B7A2+KprIvdX0ClKdtstjnNbj/oE7C6FgyQtPsE4fx7YlwID/lyJNW/NTXK6Ihle
+AsW7QWVuBkDAOTKw7PUOrkM8uqOon04OuZpGN/EnTxuHWBdgLoqDPGVgsROKv0HB
+ZqUyTPSwAm1DVD5NUhPf0w8ylaiJL1n1BBkVbcH8JSIH7XG1OWgDpKPlpEfHWMJs
+EhXD+nFpiqLq7YVxnAdtMZeO3xhueNzaqlgSyThrjtVEc5Vzck6CTZOMzw/tFWfC
++sqmWi5o2iKUXRWhzWWg04KeK/vjNXpF2KI+dhl39iq8xzkuJANxOH3IzBhLcsiI
+oOiTa0ThKq7v2mARoxMRfSOiHjwD2TfMkGSpeXkPflAo9olIFsGWHbbN9arSkfSw
+v3iPKUwgYsDOBoHXXqFRp5Vq0AL6TKxSx0uqU/bONenLj/OoSEQ3YsF1sDOZ9OzM
+/COPut9kzl9QFzhpr1WAlx+0oEblRNL+EmOQwBUtddC/3MMSCPpz4ZuwdOxEogYE
+cTMewI2Vu0ja7Z6tERAxjIW6p2KBcKMd+r3BXhNvTiOYgd3pJJkkKvY+bnlYD8hY
+EEdeWCVqW46aEk1/JOrmGn62jFclrKFqKSwF7NkOVz8UQAYQybWtvndWNPzTYprB
+C3JouQQKu4P+j84swGxG
+=Uo26
 -----END PGP SIGNATURE-----
diff --git a/media/video/vlc/vlc-1.0.2.diff b/media/video/vlc/vlc-1.0.2.diff
new file mode 100644
index 00000000..c654bb3c
--- /dev/null
+++ b/media/video/vlc/vlc-1.0.2.diff
@@ -0,0 +1,12 @@
+diff -Naur vlc-1.0.2.orig/src/misc/objects.c vlc-1.0.2/src/misc/objects.c
+--- vlc-1.0.2.orig/src/misc/objects.c	2009-09-18 13:37:49.000000000 -0300
++++ vlc-1.0.2/src/misc/objects.c	2009-09-22 13:38:55.000000000 -0300
+@@ -381,7 +381,7 @@
+         /* This can only ever happen if someone killed us without locking: */
+         assert (internals->pipes[1] == -1);
+ 
+-#ifdef HAVE_EVENTFD
++#ifdef HAVE_SYS_EVENTFD
+         internals->pipes[0] = internals->pipes[1] = eventfd (0, 0);
+         if (internals->pipes[0] == -1)
+ #endif
diff --git a/media/video/vlc/vlc.SlackBuild b/media/video/vlc/vlc.SlackBuild
index 7dcba7e2..f9e30ef1 100755
--- a/media/video/vlc/vlc.SlackBuild
+++ b/media/video/vlc/vlc.SlackBuild
@@ -15,9 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for vlc, by Silvio Rhatto
-# requires:  
-# tested: vlc-0.9.9a
-# model: generic.mkSlackBuild $Rev: 805 $
+# requires: jack libraw1394 libdc1394 mpeg2dec liba52 faac lame wxWidgets libshout ffmpeg qt4 
+# tested: vlc-1.0.2
+# model: generic.mkSlackBuild $Rev: 808 $
 #
 
 # Look for slackbuildrc
@@ -32,9 +32,9 @@ CWD="$(pwd)"
 SRC_NAME="vlc"
 PKG_NAME="vlc"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.9.9a}
+SRC_VERSION=${VERSION:=1.0.2}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
-BUILD=${BUILD:=2rha}
+BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
@@ -42,7 +42,7 @@ REPOS=${REPOS:=$TMP}
 SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/video/vlc"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
-CONF_OPTIONS=${CONF_OPTIONS:="--enable-theora --enable-dv --enable-v4l --enable-real --enable-realrtsp --enable-flac --enable-snapshot --enable-aa --enable-jack --enable-shout --disable-dc1394"}
+CONF_OPTIONS=${CONF_OPTIONS:="--enable-theora --enable-dv --enable-v4l --enable-real --enable-realrtsp --enable-flac --enable-snapshot --enable-aa --enable-jack --enable-shout --disable-dc1394 --disable-nls --disable-mozilla"}
 NUMJOBS=${NUMJOBS:=""}
 
 # Set system libraries' path and optmization flags based on $ARCH
@@ -81,7 +81,7 @@ mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
 SRC="$SRC_NAME-$VERSION.tar.bz2"
-URL="http://download.videolan.org/pub/videolan/vlc/0.9.9a/$SRC"
+URL="http://download.videolan.org/pub/videolan/vlc/1.0.2/$SRC"
 
 if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
@@ -159,6 +159,31 @@ tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TA
 PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
+# Patch source
+patches=" [[PATCH URLS]]
+         $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
+         $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
+for patch in $patches; do
+  patch="`basename $patch`"
+  if [ -f "$CWD/$patch" ]; then
+    patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH
+  elif [ -f "$CWD/patches/$patch" ]; then
+    patch -Np1 < "$CWD/patches/$patch" || exit $ERROR_PATCH
+  elif [ -f "$CWD/$patch.gz" ]; then
+    gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
+  elif [ -f "$CWD/patches/$patch.gz" ]; then
+    gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
+  elif [ -f "$SRC_DIR/$patch" ]; then
+    if [ "`basename $patch .gz`" != "$patch" ]; then
+      gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
+    elif [ "`basename $patch .bz2`" != "$patch" ]; then
+      bzip2 -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
+    else
+      patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
+    fi
+  fi
+done
+
 # Configure
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
-- 
cgit v1.2.3