Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing

4 files changed, 39 insertions, 13 deletions

diff --git a/abs/extra/community/flashplugin/PKGBUILD b/abs/extra/community/flashplugin/PKGBUILD
index 7d7e65f..e14790f 100644
--- a/abs/extra/community/flashplugin/PKGBUILD
+++ b/abs/extra/community/flashplugin/PKGBUILD
@@ -1,27 +1,36 @@
-# $Id: PKGBUILD 60911 2009-12-09 11:51:09Z andrea $
+# $Id$
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=flashplugin
 _licensefile='Reader_Player_AIR_WWEULA-Combined-20080204_1313.pdf'
-pkgver=10.1.53.64
-pkgrel=1
+pkgver=10.2.152.27
+_pkgver64=10.0.45.2
+pkgrel=4
 pkgdesc='Adobe Flash Player'
 url='http://get.adobe.com/flashplayer'
-arch=('i686' 'x86_64')
+arch=('i686') # 'x86_64')
 depends=('mozilla-common' 'libxt' 'gtk2' 'nss' 'curl')
+optdepends=('libvdpau: GPU acceleration on Nvidia card')
 replaces=('flashplugin-beta')
 provides=('flashplayer')
 license=('custom')
+options=(!strip)
+install=flashplugin.install
+backup=(etc/adobe/mms.cfg)
 source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz'
-        "http://www.adobe.com/products/eulas/pdfs/${_licensefile}")
-[ "${CARCH}" = "x86_64" ] && source[0]="http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${pkgver}.linux-${CARCH}.so.tar.gz"
-[ "${CARCH}" = "x86_64" ] && md5sums[0]='8b427c2991c0447af56a951c653ee383'
+        "http://www.adobe.com/products/eulas/pdfs/${_licensefile}"
+         mms.cfg)
+#[ "${CARCH}" = "x86_64" ] && source[0]="http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${_pkgver64}.linux-${CARCH}.so.tar.gz"
+#[ "${CARCH}" = "x86_64" ] && md5sums[0]='4a4561e456612a6751653b58342d53df'
 
 build() {
-  install -d -m755 ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
-  install -m755 ${srcdir}/libflashplayer.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
-  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-  install -m644 "${_licensefile}" ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf || return 1
+  install -d -m755 ${pkgdir}/usr/lib/mozilla/plugins/
+  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}/
+  install -d -m755 ${pkgdir}/etc/adobe
+  install -m755 ${srcdir}/install_flash_player_10_linux/libflashplayer.so ${pkgdir}/usr/lib/mozilla/plugins/
+  install -m644 "${_licensefile}" ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf
+  install -m644 ${srcdir}/mms.cfg ${pkgdir}/etc/adobe/mms.cfg
 }
-md5sums=('e4cb4d26124605a54c3d498cc440368f'
-         '1636037610ee2aa35c5fb736a697b7e0')
+md5sums=('afab0b40b0ae11445e2e90a4a9224a8a'
+         '1636037610ee2aa35c5fb736a697b7e0'
+         'f34aae6279b40e0bd2abfb0d9963d7b8')
diff --git a/abs/extra/community/flashplugin/__changelog b/abs/extra/community/flashplugin/__changelog
new file mode 100644
index 0000000..514d92d
--- /dev/null
+++ b/abs/extra/community/flashplugin/__changelog
@@ -0,0 +1,2 @@
+2/18/11 - chw - Correct path for libflashplugin.so (didn't have install_flash_player_10_linx dir).
+
diff --git a/abs/extra/community/flashplugin/flashplugin.install b/abs/extra/community/flashplugin/flashplugin.install
new file mode 100644
index 0000000..0cc1e2f
--- /dev/null
+++ b/abs/extra/community/flashplugin/flashplugin.install
@@ -0,0 +1,13 @@
+post_install() {
+    echo " >> "
+    echo " >> If you have an NVIDIA card that supports libvdpau or Broadcom Crystal HD chips,"
+    echo " >> uncomment EnableLinuxHWVideoDecode=1 from /etc/adobe/mms.cfg."
+    echo " >> If you run into problems, please contact nVidia or Broadcom along with your system config info / driver version."
+    echo " >> "
+}
+
+post_upgrade() {
+    if  [ "$(vercmp $2 10.2.152.27-2)" -lt 0 ]; then
+        post_install $1
+    fi
+}
diff --git a/abs/extra/community/flashplugin/mms.cfg b/abs/extra/community/flashplugin/mms.cfg
new file mode 100644
index 0000000..716525d
--- /dev/null
+++ b/abs/extra/community/flashplugin/mms.cfg
@@ -0,0 +1,2 @@
+#Hardware video decoding
+#EnableLinuxHWVideoDecode=1