Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

4 files changed, 100 insertions, 10 deletions

diff --git a/libre-multilib/pcsx2/PKGBUILD b/libre-multilib/pcsx2/PKGBUILD
index fbf48a49f..75fe9d689 100644
--- a/libre-multilib/pcsx2/PKGBUILD
+++ b/libre-multilib/pcsx2/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=pcsx2
 pkgver=1.3.1
-pkgrel=2.parabola1
+pkgrel=2.parabola2
 pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'
@@ -28,8 +28,9 @@ sha256sums=('60ba9f7f85bf4337ca6962f9b437d549f16fc04ea0b6b261d7521e0416c2b8c9')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  # remove Cg shader on ZZogl plugin
-  sed -i '\|zzogl-pg-cg| s|^|#|' plugins/CMakeLists.txt
+  # remove zzogl and zerogs plugins (depends nonfree nvidia-cg-toolkit)
+  rm -vr plugins/{zerogs,zzogl-pg}
+  sed -i '\|zz_res  =|,+4 d' linux_various/glsl2h.pl
 }
 
 build() {
diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index e641775a9..80c804537 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -35,7 +35,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
 options=(!emptydirs !makeflags)
 sha256sums=('b59c74f67d2f9684d9cf0db62b5c60d3ef155807e17a91ebf0899dd55670f6a0'
             '29de44253624814ae3ce3e0a6a786ba229c62e78d8c97e36257f730d38d542f7'
-            '4b798835ff3c76c436b5ea753cb002fd17c37675b9c87fdc1522019101e426fe'
+            'e3d0f5f78fede687dfc38a2787c2c8f33c8213be286abeb9176e3dcebabb0b74'
             '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a'
             'b2ecbeec986ba8ba66ac8f98faf30dabec49213cc35979d17d39cd699f41ba83'
             '798d5bff1e6025e9a803b67f629afac740f16e537b714ee7c7e829b2345fb6a2')
@@ -68,11 +68,6 @@ prepare() {
 
   quilt push -av
 
-  # Fix package-manifest.in
-  sed -i '\|; Phishing Protection| s|$|\n#ifdef MOZ_SAFE_BROWSING|;
-          \|@BINPATH@/components/url-classifier[.]xpt| s|$|\n#endif|
-         ' mail/installer/package-manifest.in
-
   # Fix branding
   sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties}
 
diff --git a/libre/icedove/mozconfig b/libre/icedove/mozconfig
index 1445636a1..20cb08590 100644
--- a/libre/icedove/mozconfig
+++ b/libre/icedove/mozconfig
@@ -26,7 +26,6 @@ ac_add_options --enable-system-cairo
 ac_add_options --enable-system-pixman
 
 # Features
-ac_add_options --enable-safe-browsing
 ac_add_options --enable-startup-notification
 ac_add_options --enable-gio
 
@@ -47,3 +46,5 @@ mk_add_options MOZILLA_OFFICIAL=1
 
 # Parabola features
 ac_add_options --disable-official-branding
+ac_add_options --disable-safe-browsing
+ac_add_options --disable-url-classifier
diff --git a/pcr/pcsx2-git/PKGBUILD b/pcr/pcsx2-git/PKGBUILD
new file mode 100644
index 000000000..cfa006812
--- /dev/null
+++ b/pcr/pcsx2-git/PKGBUILD
@@ -0,0 +1,93 @@
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+
+# Based on pcsx2 (parabola) package
+
+_pkgname=pcsx2
+pkgname=pcsx2-git
+pkgver=r6873.9c7d417
+pkgrel=1.parabola1
+pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support'
+arch=('i686' 'x86_64')
+url='http://www.pcsx2.net'
+license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3')
+depends_i686=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo'
+              'portaudio' 'sdl' 'soundtouch' 'wxgtk')
+depends_x86_64=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra'
+                'lib32-libjpeg-turbo'
+                'lib32-portaudio' 'lib32-sdl' 'lib32-soundtouch' 'lib32-wxgtk')
+makedepends=('cmake' 'git')
+makedepends_x86_64=('gcc-multilib')
+optdepends_x86_64=('lib32-gtk-engines: GTK2 engines support'
+                   'lib32-gtk-engine-murrine: Murrine GTK3 engine support'
+                   'lib32-gtk-engine-unico: Unico GTK2 engine support')
+provides=("${_pkgname}")
+conflicts=("${_pkgname}" "${_pkgname}-libre")
+replaces=("${_pkgname}-libre")
+options=('!emptydirs')
+source=(${pkgname}-${pkgver}::git+https://github.com/PCSX2/pcsx2.git)
+sha256sums=('SKIP')
+
+pkgver() {
+  cd ${pkgname}-${pkgver}
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # remove zzogl and zerogs plugins (depends nonfree nvidia-cg-toolkit)
+  rm -vr plugins/{zerogs,zzogl-pg}
+  sed -i '\|# ZZOGL|,+6 d' linux_various/glsl2h.pl
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  if [[ $CARCH == i686 ]]; then
+    cmake .. \
+      -DCMAKE_BUILD_TYPE='Release' \
+      -DCMAKE_INSTALL_PREFIX='/usr' \
+      -DCMAKE_LIBRARY_PATH='/usr/lib' \
+      -DPLUGIN_DIR='/usr/lib/pcsx2' \
+      -DGAMEINDEX_DIR='/usr/share/pcsx2' \
+      -DDISABLE_ADVANCE_SIMD='TRUE' \
+      -DEXTRA_PLUGINS='TRUE' \
+      -DREBUILD_SHADER='TRUE' \
+      -DGLSL_API='TRUE' \
+      -DPACKAGE_MODE='TRUE' \
+      -DXDG_STD='TRUE'
+  elif [[ $CARCH == x86_64 ]]; then
+    cmake .. \
+      -DCMAKE_BUILD_TYPE='Release' \
+      -DCMAKE_TOOLCHAIN_FILE='cmake/linux-compiler-i386-multilib.cmake' \
+      -DCMAKE_INSTALL_PREFIX='/usr' \
+      -DCMAKE_LIBRARY_PATH='/usr/lib32' \
+      -DPLUGIN_DIR='/usr/lib32/pcsx2' \
+      -DGAMEINDEX_DIR='/usr/share/pcsx2' \
+      -DDISABLE_ADVANCE_SIMD='TRUE' \
+      -DEXTRA_PLUGINS='TRUE' \
+      -DREBUILD_SHADER='TRUE' \
+      -DGLSL_API='TRUE' \
+      -DPACKAGE_MODE='TRUE' \
+      -DXDG_STD='TRUE'
+  fi
+
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}/build
+
+  make DESTDIR="${pkgdir}" install
+
+  # create pcsx2 binary link and copy PCSX2.1 to pcsx2.1 man page
+  ln -vs PCSX2 ${pkgdir}/usr/bin/pcsx2
+  cp -va ${pkgdir}/usr/share/man/man1/{PCSX,pcsx}2.1
+}
+
+# vim: ts=2 sw=2 et: