summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/dpkg/PKGBUILD185
-rw-r--r--libre/dpkg/dpkg-gzip-rsyncable.patch19
-rw-r--r--libre/libretools/PKGBUILD16
-rw-r--r--libre/libretools/libretools.install64
-rw-r--r--libre/linux-libre-tools/01-fix-perf-python.patch12
-rw-r--r--libre/linux-libre-tools/PKGBUILD121
-rw-r--r--libre/ogre-libre/PKGBUILD32
-rw-r--r--libre/ogre-libre/libre.patch694
-rw-r--r--libre/xbmc-libre/PKGBUILD12
-rw-r--r--libre/xbmc-libre/polkit.rules19
-rw-r--r--libre/xbmc-libre/xbmc.install11
11 files changed, 1031 insertions, 154 deletions
diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
index 806194577..99681df3e 100644
--- a/libre/dpkg/PKGBUILD
+++ b/libre/dpkg/PKGBUILD
@@ -12,20 +12,38 @@ pkgname=(dpkg-devtools perl-dpkg)
pkgdesc="Debian Package manager and utilities"
license=('GPL2')
-pkgver=1.16.10
+pkgver=1.17.6
url="http://packages.debian.org/source/sid/dpkg"
-_debrepo=http://ftp.debian.org/debian/pool/main
-
-pkgrel=1.3
-arch=('i686' 'x86_64' 'mips64el')
-depends=('bzip2' 'xz' 'zlib' 'ncurses')
-checkdepends=('perl-test-pod')
-makedepends=('perl-io-string' 'perl-timedate')
+pkgrel=1
+options=('staticlibs')
+
+if ! type in_array &>/dev/null; then
+ in_array() {
+ local i
+ for i in "${@:2}"; do [[ $i = "$1" ]] && return 0; done
+ return 1
+ }
+fi
+
+# The architecture dependent bits aren't packaged with the reduced pkgname
+arch=('any')
+for _pkg in dpkg dselect libdpkg; do
+ if in_array "$_pkg" "${pkgname[@]}"; then
+ arch=('i686' 'x86_64' 'mips64el')
+ fi
+done
+unset _pkg
+
+makedepends=('bzip2' 'xz' 'zlib' 'ncurses')
+checkdepends=('gzip' 'perl-test-pod' 'perl-io-string' 'perl-timedate')
-_debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; }
-source=("$(_debfile ${pkgbase} ${pkgver}).tar.xz"
+_debrepo=http://ftp.debian.org/debian/pool/main
+_debfile() { echo "${_debrepo}/${1:0:1}/${1%_*}/${1}"; }
+source=("$(_debfile ${pkgbase}_${pkgver}).tar.xz"
dpkg-gzip-rsyncable.patch)
+md5sums=('c87f2ae291d460015353e01d121bea85'
+ '9c77a553e3219dcd29b7ff44b89d718d')
######################################################################
@@ -34,97 +52,104 @@ source=("$(_debfile ${pkgbase} ${pkgver}).tar.xz"
# Shame on the dpkg developers for not putting that logic into the build system.
_destdir="$pkgbase-$pkgver/debian/pkg-makepkg"
_debhelper_install() {
- local debname=$1
- cd "$srcdir/$_destdir"
-
- # main files
- sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install \
- | while read pattern dest; do
- if [[ -z $dest ]]; then
- for file in $pattern; do
- install -d "$pkgdir/${file%/*}"
- cp -a "$file" "$pkgdir/$file" || true
- done
- else
- install -d "$pkgdir/$dest/"
- cp -a "$pattern" "$pkgdir/$dest/" || true
- fi
- done
-
- # manpages
- sed -e 's|^debian/tmp/||' -e '/^\s*$/d' ../$debname.manpages 2>/dev/null \
- | while read pattern; do
- for file in $pattern; do
- install -d "$pkgdir/${file%/*}"
- cp -a "$file" "$pkgdir/$file" || true
- done
- done
-
- # other documentation
- install -d "$pkgdir/usr/share/doc/$pkgname/"
- sed '/^\s*$/d' ../$debname.docs 2>/dev/null \
- | while read file; do
- gzip \
- < "$srcdir/$pkgbase-$pkgver/$file" \
- > "$pkgdir/usr/share/doc/$pkgname/${file##*/}.gz"
- done
-
- # symlinks
- sed '/^\s*$/d' ../$debname.links 2>/dev/null \
- | while read file link; do
- ln -s "/$file" "$pkgdir/$link"
- done
+ local debname=$1
+ cd "$srcdir/$_destdir"
+
+ # main files
+ sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install |
+ while read pattern dest; do
+ if [[ -z $dest ]]; then
+ for file in $pattern; do
+ install -d "$pkgdir/${file%/*}"
+ cp -a "$file" "$pkgdir/$file" || true
+ done
+ else
+ install -d "$pkgdir/$dest/"
+ cp -a "$pattern" "$pkgdir/$dest/" || true
+ fi
+ done
+
+ # manpages
+ sed -e 's|^debian/tmp/||' -e '/^\s*$/d' ../$debname.manpages 2>/dev/null |
+ while read pattern; do
+ for file in $pattern; do
+ install -d "$pkgdir/${file%/*}"
+ cp -a "$file" "$pkgdir/$file" || true
+ done
+ done
+
+ # other documentation
+ sed '/^\s*$/d' ../$debname.docs 2>/dev/null |
+ while read file; do
+ install -d "$pkgdir/usr/share/doc/$pkgname/"
+ gzip \
+ < "$srcdir/$pkgbase-$pkgver/$file" \
+ > "$pkgdir/usr/share/doc/$pkgname/${file##*/}.gz"
+ done
+
+ # symlinks
+ sed '/^\s*$/d' ../$debname.links 2>/dev/null |
+ while read file link; do
+ ln -s "/$file" "$pkgdir/$link"
+ done
}
######################################################################
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- patch -Np0 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
+prepare() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ # {Arch Linux,Parabola}'s gzip doesn't support --rsyncable
+ patch -Np1 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
+}
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma
- make
- make DESTDIR="$srcdir/$_destdir" install
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --sysconfdir=/etc \
+ --sbindir=/sbin \
+ --localstatedir=/var \
+ --with-zlib \
+ --with-liblzma \
+ --with-bz2
+ make
+ make DESTDIR="$srcdir/$_destdir" install
}
check() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make check
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make check
}
package_dpkg() {
- pkgdesc="Debian Package manager"
- provides+=(start-stop-daemon)
- conflicts+=(start-stop-daemon)
- _debhelper_install dpkg
+ pkgdesc="Debian Package manager"
+ depends=('zlib' 'xz' 'bzip2')
+ _debhelper_install dpkg
}
package_dpkg-devtools() {
- pkgdesc="Debian Package development tools"
- arch=(any)
- depends+=(perl-dpkg)
- _debhelper_install dpkg-dev
+ pkgdesc="Debian Package development tools"
+ arch=('any')
+ depends=('perl-dpkg')
+ _debhelper_install dpkg-dev
}
package_dselect() {
- pkgdesc="Debian Package manager high-level interface"
- _debhelper_install dselect
+ pkgdesc="Debian Package manager high-level interface"
+ depends=('dpkg' 'perl' 'ncurses')
+ _debhelper_install dselect
}
package_libdpkg() {
- pkgdesc="Debian Package manager library (static)"
- _debhelper_install libdpkg-dev
+ pkgdesc="Debian Package manager library (static)"
+ _debhelper_install libdpkg-dev
}
package_perl-dpkg() {
- pkgdesc="Debian Package perl modules"
- arch=(any)
- _debhelper_install libdpkg-perl
+ pkgdesc="Debian Package Perl modules"
+ arch=('any')
+ depends=('perl-timedate' 'gzip' 'bzip2' 'xz')
+ _debhelper_install libdpkg-perl
}
-
-md5sums=('4df9319b2d17e19cdb6fe94dacee44da'
- '5ab63758999e9bb10f84bce79a0307b2'
- '74b7ce3045690a8fc290104f10cf8d42')
-md5sums=('a20a06a5272717274a8b009368f237da'
- '5ab63758999e9bb10f84bce79a0307b2')
diff --git a/libre/dpkg/dpkg-gzip-rsyncable.patch b/libre/dpkg/dpkg-gzip-rsyncable.patch
index 3daf6d76e..187633874 100644
--- a/libre/dpkg/dpkg-gzip-rsyncable.patch
+++ b/libre/dpkg/dpkg-gzip-rsyncable.patch
@@ -1,11 +1,12 @@
---- ./scripts/Dpkg/Compression.pm.orig 2012-04-27 04:49:02.000000000 +0200
-+++ ./scripts/Dpkg/Compression.pm 2012-05-27 22:23:18.530628795 +0200
-@@ -52,7 +52,7 @@
+diff -ruN dpkg-1.17.6.orig/scripts/Dpkg/Compression.pm dpkg-1.17.6/scripts/Dpkg/Compression.pm
+--- dpkg-1.17.6.orig/scripts/Dpkg/Compression.pm 2014-01-15 09:02:16.000000000 -0500
++++ dpkg-1.17.6/scripts/Dpkg/Compression.pm 2014-01-19 23:22:39.771215424 -0500
+@@ -50,7 +50,7 @@
my $COMP = {
- "gzip" => {
- "file_ext" => "gz",
-- "comp_prog" => [ "gzip", "--no-name", "--rsyncable" ],
-+ "comp_prog" => [ "gzip", "--no-name" ],
- "decomp_prog" => [ "gunzip" ],
- "default_level" => 9,
+ gzip => {
+ file_ext => 'gz',
+- comp_prog => [ 'gzip', '--no-name', '--rsyncable' ],
++ comp_prog => [ 'gzip', '--no-name' ],
+ decomp_prog => [ 'gunzip' ],
+ default_level => 9,
},
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 569706f80..51d33f1cd 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -1,5 +1,5 @@
-# Maintainer: Joshua Haase <hahj87@gmail.com
-# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: Joshua Haase <hahj87@gmail.com
# Contributor: fauno <fauno@kiwwwi.com.ar>
# Contributor: Márcio Silva <coadde@lavabit.com>
@@ -9,9 +9,9 @@ pkgdesc="Programs for Parabola development"
url="https://projects.parabolagnulinux.org/packages/libretools.git/"
license=('GPL3' 'GPL2')
-pkgver=20131112
-_libretools_commit=0f03eb7ac94ad72f551eb1b2470b850d6bcf8bf0
-_devtools_commit=021653a0acecc8763e1bbe90dbb770b4e6df4390
+pkgver=20140120.1
+_libretools_commit=641002eff37a30eb2b8237b15b74cc15b4d9f822
+_devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd
_packages_url=https://projects.parabolagnulinux.org/packages
source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -64,8 +64,8 @@ package_libretools() {
depends=(
"librelib=$pkgver"
+ "gitget=$pkgver" # `createworkdir`
arch-install-scripts # `archroot` uses `pacstrap`
- git # `createworkdir`
openssh # `librerelease`
rsync # `librerelease` and `makechrootpkg.sh`
subversion # `diff-unfree`
@@ -87,5 +87,5 @@ package_libretools-mips64el() {
make install-libretools-mips64el DESTDIR="$pkgdir"
}
-md5sums=('81e6d3d6fe1964a407a4520ce0916c0d'
- '656008e8e35e6adba527b7bfc367b9f7')
+md5sums=('8991b27aed494b60f33c84dd48aea874'
+ 'ec69dffa68829f063224de19bbd55fa9')
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index d46990da8..35edf68c7 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -1,14 +1,54 @@
#!/bin/sh
-_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
+_edit_code=" 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'"
+_edit_cmnt='#%s # commented out by the libretools post_install script'
+
+_add_cmnt='# The following line is added by the libretools post_install script'
+_add_code='DLAGENTS+=({https,libre}'\''::/usr/bin/librefetch -p "$BUILDFILE" -- %u %o'\'')'
+
+# These lines were installed by previous versions of this script
+_old_code=(
+ '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
+ '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")'
+ 'DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p $(printf "%q" "$BUILDFILE") -- %u %o")'
+)
+
+# has_line $line
+has_line() { grep -Fxq -- "$1" etc/makepkg.conf; }
+# add_line $line
+add_line() { printf '%s\n' "$1" >> etc/makepkg.conf; }
+# del_line $line
+del_line() {
+ local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1))
+ if [[ "${#lineno[@]}" -gt 0 ]]; then
+ sed -i "$(printf '%dd;' "${lineno[@]}")" etc/makepkg.conf;
+ fi
+}
+# rep_line $orig $replacement_bre
+rep_line() {
+ local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1))
+ if [[ "${#lineno[@]}" == 1 ]]; then
+ sed -i "${lineno}s|.*|${2//|/\\|}|" etc/makepkg.conf;
+ fi
+}
# arg 1: the new package version
post_install() {
- if grep -q 'libre::' etc/makepkg.conf; then
+ if grep -q 'librefetch' etc/makepkg.conf; then
libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf"
+ local line del=false
+ for line in "${_old_code[@]}"; do
+ if has_line "$line"; then
+ pre_remove
+ post_install
+ return $?
+ fi
+ done
else
- libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf"
- printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf
+ libremessages msg2 "libretools: adding librefetch to /etc/makepkg.conf"
+ rep_line "$_edit_code" "$(printf "$_edit_cmnt" '&')"
+ add_line "$_add_cmnt"
+ add_line "$_add_code"
fi
}
@@ -19,10 +59,14 @@ post_upgrade() {
}
pre_remove() {
- if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then
- libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
- sed -i '/libre::/d' etc/makepkg.conf
- else
- libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it"
- fi
+ libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
+
+ rep_line "$(printf "$_edit_cmnt" "$_edit_code")" "$_edit_code"
+ del_line "$_add_cmnt"
+ del_line "$_add_code"
+
+ local line
+ for line in "${_old_code[@]}"; do
+ del_line "$line"
+ done
}
diff --git a/libre/linux-libre-tools/01-fix-perf-python.patch b/libre/linux-libre-tools/01-fix-perf-python.patch
new file mode 100644
index 000000000..d46bd773c
--- /dev/null
+++ b/libre/linux-libre-tools/01-fix-perf-python.patch
@@ -0,0 +1,12 @@
+--- a/tools/perf/config/feature-checks/Makefile 2014-01-21 01:58:25.444339009 +0100
++++ b/tools/perf/config/feature-checks/Makefile 2014-01-21 01:46:58.081780576 +0100
+@@ -103,9 +103,6 @@
+ test-libperl:
+ $(BUILD) $(FLAGS_PERL_EMBED)
+
+-override PYTHON := python
+-override PYTHON_CONFIG := python-config
+-
+ escape-for-shell-sq = $(subst ','\'',$(1))
+ shell-sq = '$(escape-for-shell-sq)'
+
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 78c0f4ea2..060d84bf2 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,19 +1,24 @@
-# $Id: PKGBUILD 102149 2013-12-05 21:51:01Z seblu $
+# $Id: PKGBUILD 104447 2014-01-21 01:10:56Z seblu $
# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgbase=linux-libre-tools
-pkgname=('linux-libre-tools-meta'
- 'libtraceevent-libre'
- 'perf-libre'
- 'cpupower-libre'
- 'x86_energy_perf_policy-libre'
- 'usbip-libre')
-_basekernel=3.12
-_sublevel=3
-_pkgver=$_basekernel.$_sublevel
+pkgname=(
+ 'acpidump-libre'
+ 'cgroup_event_listener-libre'
+ 'cpupower-libre'
+ 'libtraceevent-libre'
+ 'linux-libre-tools-meta'
+ 'perf-libre'
+ 'tmon-libre'
+ 'usbip-libre'
+ 'x86_energy_perf_policy-libre'
+)
+_basekernel=3.13
+#_sublevel=3
+#_pkgver=$_basekernel.$_sublevel
pkgver=$_basekernel
-pkgrel=2
+pkgrel=1
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
url='http://linux-libre.fsfla.org/'
@@ -22,24 +27,28 @@ options=('!strip')
# kernel source deps
makedepends=('asciidoc' 'xmlto')
# perf-libre deps
-makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'numactl')
# cpupower-libre deps
makedepends+=('pciutils')
# usbip-libre deps
makedepends+=('glib2' 'sysfsutils')
+# tmon-libre deps
+makedepends+=('ncurses')
groups=("$pkgbase")
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/linux-libre-$_basekernel-gnu.tar.xz"
- "http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz"
+ #"http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz"
'cpupower.default'
'cpupower.systemd'
'cpupower.service'
- 'usbipd.service')
-sha256sums=('66c1fa816cb4a3b2f6078e1f6256133697ca4cc4186758c58c2b4d0153ed3237'
- '561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb'
+ 'usbipd.service'
+ '01-fix-perf-python.patch')
+sha256sums=('6e68eef826b17ae9d7df01ac13e46ef5d978670071d1b05aed775bdbff8fed96'
+ #'561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb'
'4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
- '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f')
+ '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
+ 'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a')
prepare() {
# apply stable patching set
@@ -52,36 +61,37 @@ prepare() {
}
build() {
- msg2 'Build libtraceevent-libre'
+ msg2 'libtraceevent-libre'
pushd linux-$pkgver/tools/lib/traceevent
make
popd
- msg2 'Build perf-libre'
+ msg2 'perf-libre'
pushd linux-$pkgver/tools/perf
make \
WERROR=0 \
DESTDIR="$pkgdir/usr" \
perfexecdir='lib/perf' \
PYTHON=python2 \
+ PYTHON_CONFIG=python2-config \
NO_GTK2=1 \
PERF_VERSION=$pkgver-$pkgrel \
all man
popd
- msg2 'Build cpupower-libre'
+ msg2 'cpupower-libre'
pushd linux-$pkgver/tools/power/cpupower
# we cannot use --as-needed
- LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
+ #LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
make VERSION=$pkgver-$pkgrel
popd
- msg2 'Build x86_energy_perf_policy-libre'
+ msg2 'x86_energy_perf_policy-libre'
pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
make
popd
- msg2 'Build usbip-libre'
+ msg2 'usbip-libre'
pushd linux-$pkgver/drivers/staging/usbip/userspace
# fix missing man page
sed -i 's/usbip_bind_driver.8//' Makefile.am
@@ -89,12 +99,37 @@ build() {
./configure --prefix=/usr --sbindir=/usr/bin
make
popd
+
+ msg2 'tmon-libre'
+ pushd linux-$pkgver/tools/thermal/tmon
+ make
+ popd
+
+ msg2 'acpidump-libre'
+ pushd linux-$pkgver/tools/power/acpi
+ make
+ popd
+
+ msg2 'cgroup_event_listener-libre'
+ pushd linux-$pkgver/tools/cgroup
+ make
+ popd
}
package_linux-libre-tools-meta() {
pkgdesc='Linux kernel tools meta package'
groups=()
- depends=('libtraceevent-libre' 'perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
+ depends=(
+ 'acpidump-libre'
+ 'cgroup_event_listener-libre'
+ 'cpupower-libre'
+ 'libtraceevent-libre'
+ 'linux-libre-tools-meta'
+ 'perf-libre'
+ 'tmon-libre'
+ 'usbip-libre'
+ 'x86_energy_perf_policy-libre'
+ )
replaces=('linux-tools-meta')
conflicts=('linux-tools-meta')
provides=("linux-tools-meta=$pkgver")
@@ -114,7 +149,8 @@ package_libtraceevent-libre() {
package_perf-libre() {
pkgdesc='Linux kernel performance auditing tool'
- depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils')
+ depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils'
+ 'numactl')
replaces=('perf')
conflicts=('perf')
provides=("perf=$pkgver")
@@ -125,6 +161,7 @@ package_perf-libre() {
DESTDIR="$pkgdir/usr" \
perfexecdir='lib/perf' \
PYTHON=python2 \
+ PYTHON_CONFIG=python2-config \
NO_GTK2=1 \
PERF_VERSION=$pkgver-$pkgrel \
install install-man
@@ -186,4 +223,38 @@ package_usbip-libre() {
install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
}
+package_tmon-libre() {
+ pkgdesc='Monitoring and Testing Tool for Linux kernel thermal subsystem'
+ depends=('glibc' 'ncurses')
+ replaces=('tmon')
+ conflicts=('tmon')
+ provides=("tmon=$pkgver")
+
+ cd linux-$pkgver/tools/thermal/tmon
+ make install INSTALL_ROOT="$pkgdir"
+}
+
+package_acpidump-libre() {
+ pkgdesc='Dump system ACPI tables to an ASCII file'
+ depends=('glibc')
+ replaces=('acpidump')
+ conflicts=('acpidump' 'iasl')
+ provides=("acpidump=$pkgver")
+
+ cd linux-$pkgver/tools/power/acpi
+ install -Dm755 acpidump "$pkgdir/usr/bin/acpidump"
+ install -Dm644 acpidump.8 "$pkgdir/usr/share/man/man8/acpidump.8"
+}
+
+package_cgroup_event_listener-libre() {
+ pkgdesc='Simple listener of cgroup events'
+ depends=('glibc')
+ replaces=('cgroup_event_listener')
+ conflicts=('cgroup_event_listener')
+ provides=("cgroup_event_listener=$pkgver")
+
+ cd linux-$pkgver/tools/cgroup
+ install -Dm755 cgroup_event_listener "$pkgdir/usr/bin/cgroup_event_listener"
+}
+
# vim:set ts=2 sw=2 et:
diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD
index 57c001e61..9648e5f24 100644
--- a/libre/ogre-libre/PKGBUILD
+++ b/libre/ogre-libre/PKGBUILD
@@ -43,16 +43,44 @@ makedepends=(
mercurial
ttf-dejavu
)
-source=(
+mksource=(
ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-}
+ libre.patch
)
-sha512sums=(
+source=(
+ https://repo.parabolagnulinux.org/other/$pkgbase/$pkgbase-libre-$pkgver.tar.xz
+)
+mksha512sums=(
SKIP
+ e668b39e4784e4b1b17ec6e21b5cef45f29a8d8e73288817ce7832d1fe24527d5e0d4fd67b8f756db301e4211ceac2d5c387c1599e799ca41de0593457204767
+)
+sha512sums=(
+ 9be9dbd78e09c8c50cf833004bfa3fbb7b3cd2a0f52a4e8c4beb1eb30357625455d65906bd007be6c2be9cf90a0e335d5ad7c5011e038c3d0754d5b3b18c4a2a
)
+mksource() {
+ cd ${pkgbase}
+
+ # remove nonfree files
+ rm -v RenderSystems/GL/include/GL/{gl{,ext},wglext,glx{tokens,ext}}.h
+ rm -v RenderSystems/GL3Plus/include/GL/glxtokens-backup.h
+ rm -rv Samples/Media/materials/textures/nvidia
+ rm -v Samples/Media/packs/chiropteraDM.{pk3,txt}
+ rm -v CMake/Templates/quakemap{,_d}.cfg.in
+ patch -Np1 -i $srcdir/libre.patch
+}
+
build() {
cd ${pkgbase}
+ # add symlinks to point to mesa header files
+ cd RenderSystems/GL/include/GL
+ ln -sv /usr/include/GL/gl.h gl.h
+ ln -sv /usr/include/GL/glext.h glext.h
+ ln -sv /usr/include/GL/wglext.h wglext.h
+ ln -sv /usr/include/GL/glxtokens.h glxtokens.h
+ ln -sv /usr/include/GL/glxext.h glxext.h
+
# get a clean build dir
[[ -d build ]] && rm -vrf build
mkdir -v build && cd build
diff --git a/libre/ogre-libre/libre.patch b/libre/ogre-libre/libre.patch
new file mode 100644
index 000000000..77c32c8d4
--- /dev/null
+++ b/libre/ogre-libre/libre.patch
@@ -0,0 +1,694 @@
+diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cmake
+--- ogre.orig/CMake/InstallResources.cmake 2014-01-15 01:56:25.549401653 -0200
++++ ogre/CMake/InstallResources.cmake 2014-01-21 21:24:52.510763877 -0200
+@@ -116,9 +116,6 @@
+ # create plugins.cfg
+ configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg)
+ configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg)
+-# create quakemap.cfg
+-configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg)
+-configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg)
+ # create samples.cfg
+ configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg)
+ configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg)
+@@ -219,11 +216,6 @@
+ configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/release/plugins.cfg)
+ configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/plugins.cfg)
+ configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/plugins.cfg)
+- # create quakemap.cfg
+- configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/quakemap_d.cfg)
+- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/release/quakemap.cfg)
+- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/quakemap.cfg)
+- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/quakemap.cfg)
+ # create samples.cfg
+ configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/samples_d.cfg)
+ configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/release/samples.cfg)
+diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demomedia.wxi.in
+--- ogre.orig/CMake/Templates/demomedia.wxi.in 2014-01-15 01:56:25.652728172 -0200
++++ ogre/CMake/Templates/demomedia.wxi.in 2014-01-21 21:49:24.962291640 -0200
+@@ -295,13 +295,6 @@
+ <ComponentRef Id="cmpA1FEB51B0386689568AAFC22E0D71B6B" />
+ <ComponentRef Id="cmpA3F7363F0553143ABF1CA52A2FD433D6" />
+ <ComponentRef Id="cmp0344A18C23958D312C044A6E8443CD9D" />
+- <ComponentRef Id="cmp30B19313C1A692A69AC9C275E4E5D5CC" />
+- <ComponentRef Id="cmp376B3837DF007338AC14AB58C726A8B1" />
+- <ComponentRef Id="cmp02B151F3B587EAF5AF116E6A3B09E247" />
+- <ComponentRef Id="cmpFA2310874B7C3D5229AF9BEACAF6746A" />
+- <ComponentRef Id="cmpB11E2174087D0D3FC791806231C1DBF5" />
+- <ComponentRef Id="cmpF00ABD2DB6C6A8D718E0E4B5CD6B1C09" />
+- <ComponentRef Id="cmpA603C50287BBE370F0BDF5FBE7A3233F" />
+ <ComponentRef Id="cmpEA39DA48CA01586DF3412795541AD2FC" />
+ <ComponentRef Id="cmp50C3E068724D3C32847EEB132308B147" />
+ <ComponentRef Id="cmp78D10E140133F6977C74A8F912B2B217" />
+@@ -328,8 +321,6 @@
+ <ComponentRef Id="cmpDFD58144C55506C82E22CF1AC14714B8" />
+ <ComponentRef Id="cmp9BF13256D468C8147B7050A93B09C032" />
+ <ComponentRef Id="cmp86F908FD9E8E5FFAD0C2D9A37A098E4C" />
+- <ComponentRef Id="cmpDEED3FE7C35E18D0FA59B8BB3DF42244" />
+- <ComponentRef Id="cmp98499D3076FA7324AFE1F9F8D10FB421" />
+ <ComponentRef Id="cmp532E67011B733ACE674692F6ED52775D" />
+ <ComponentRef Id="cmp572AE70CCC0D85E8DA35F87B45768634" />
+ <ComponentRef Id="cmp013036935784DEC9BAE62831C93EFA18" />
+@@ -1338,29 +1329,6 @@
+ <Component Id="cmp0344A18C23958D312C044A6E8443CD9D" Guid="{E47FE6B7-B6BD-4FCA-A903-87281A6B8CEB}">
+ <File Id="fil39C72570EB0CBAC9AF4FF900C2D5D525" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\WoodPallet.png" />
+ </Component>
+- <Directory Id="dir11696C93BEAB38C45931BCBDDB2A6789" Name="nvidia">
+- <Component Id="cmp30B19313C1A692A69AC9C275E4E5D5CC" Guid="{68CA4BF9-5A51-400F-B5C2-701A4DA8D331}">
+- <File Id="fil40BA6B2C4D12AD2C5710179390B9D2DB" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds" />
+- </Component>
+- <Component Id="cmp376B3837DF007338AC14AB58C726A8B1" Guid="{CF5BBEF1-4E44-46E9-8373-4FF589D19F6F}">
+- <File Id="fil6A9EC7DE38E4F700741187344AAB9A4C" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\dirt_grayrocky_normalheight.dds" />
+- </Component>
+- <Component Id="cmp02B151F3B587EAF5AF116E6A3B09E247" Guid="{EB6D162E-A67A-4CD1-948D-66B84457AFBD}">
+- <File Id="fil30FFE3069E40D44C734E168BEB336DA0" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\grass_green-01_diffusespecular.dds" />
+- </Component>
+- <Component Id="cmpFA2310874B7C3D5229AF9BEACAF6746A" Guid="{C6E468AC-67EE-44C6-9F01-69D369D966FC}">
+- <File Id="fil4C7A93A8C53E76F5F5ED65D1F52659DD" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\grass_green-01_normalheight.dds" />
+- </Component>
+- <Component Id="cmpB11E2174087D0D3FC791806231C1DBF5" Guid="{3A30B7B3-6D8D-4475-B31E-5626B54DD65B}">
+- <File Id="fil909FAC7A36B3EA5B9F4660701BEC09F5" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds" />
+- </Component>
+- <Component Id="cmpF00ABD2DB6C6A8D718E0E4B5CD6B1C09" Guid="{EE4979FF-6320-432A-98B2-F183BCAC197A}">
+- <File Id="fil23D0DB8C9CA160970B9C29DD8F77B5CF" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds" />
+- </Component>
+- <Component Id="cmpA603C50287BBE370F0BDF5FBE7A3233F" Guid="{E8AD7243-C2F2-4C00-AE8E-DC38E20927FA}">
+- <File Id="fil6A4613F0DA3B5B562C5C68C05DFF0171" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\TextureUsageAgreement.txt" />
+- </Component>
+- </Directory>
+ </Directory>
+ </Directory>
+ <Directory Id="dir01544E63CCE21518F3D56A0A93D1DC4A" Name="models">
+@@ -1444,12 +1412,6 @@
+ </Component>
+ </Directory>
+ <Directory Id="dir4ABFE5E33570C5CDD587CDA5FEC53CBC" Name="packs">
+- <Component Id="cmpDEED3FE7C35E18D0FA59B8BB3DF42244" Guid="{5B8E1BED-1BC5-4A20-BA09-9699D0AF7BFC}">
+- <File Id="fil43F38AE712D50BF0076D8C8E08E3264C" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\chiropteraDM.pk3" />
+- </Component>
+- <Component Id="cmp98499D3076FA7324AFE1F9F8D10FB421" Guid="{38CA3EF3-96E4-47D1-8B4C-682BCCF91E99}">
+- <File Id="fil98BCB56BE20EF36A4F72F07CDADC63DE" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\chiropteraDM.txt" />
+- </Component>
+ <Component Id="cmp532E67011B733ACE674692F6ED52775D" Guid="{9AC3FA7E-FBDC-4448-A61B-615EF43EB923}">
+ <File Id="filC6E116063CEC1DFBE1D6B452FD089931" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\cubemap.zip" />
+ </Component>
+@@ -1794,4 +1756,4 @@
+ </Directory>
+ </DirectoryRef>
+ </Fragment>
+-</Include>
+\ No newline at end of file
++</Include>
+diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj
+--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-01-15 01:56:25.872713663 -0200
++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-01-21 22:20:00.343185180 -0200
+@@ -555,48 +555,6 @@
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+ </None>
+- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- </None>
+ <None Include="..\..\Media\materials\textures\ogreborder.png">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+@@ -3671,15 +3629,6 @@
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+ </None>
+- <None Include="..\..\Media\packs\chiropteraDM.pk3">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- </None>
+ <None Include="..\..\Media\packs\cubemap.zip">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+ <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+@@ -4867,20 +4816,6 @@
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+ </None>
+- <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- </None>
+- <None Include="..\..\Media\packs\chiropteraDM.txt">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- </None>
+ <None Include="..\..\Media\RTShaderLib\cache\dummy.txt">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+@@ -4893,4 +4828,4 @@
+ <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+-</Project>
+\ No newline at end of file
++</Project>
+diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters
+--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-01-15 01:56:25.872713663 -0200
++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-01-21 22:20:41.517291770 -0200
+@@ -628,9 +628,6 @@
+ <None Include="..\..\Media\models\Barrel.mesh">
+ <Filter>Assets\media</Filter>
+ </None>
+- <None Include="..\..\Media\packs\chiropteraDM.pk3">
+- <Filter>Assets\media</Filter>
+- </None>
+ <None Include="..\..\Media\models\column.mesh">
+ <Filter>Assets\media</Filter>
+ </None>
+@@ -1075,9 +1072,6 @@
+ <None Include="..\..\Media\materials\textures\checker.png">
+ <Filter>Assets\media</Filter>
+ </None>
+- <None Include="..\..\Media\packs\chiropteraDM.txt">
+- <Filter>Assets\media</Filter>
+- </None>
+ <None Include="..\..\Media\materials\textures\Chrome.jpg">
+ <Filter>Assets\media</Filter>
+ </None>
+@@ -1105,12 +1099,6 @@
+ <None Include="..\..\Media\materials\textures\dirt01.jpg">
+ <Filter>Assets\media</Filter>
+ </None>
+- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds">
+- <Filter>Assets\media</Filter>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds">
+- <Filter>Assets\media</Filter>
+- </None>
+ <None Include="..\..\Media\materials\textures\dkyellow.png">
+ <Filter>Assets\media</Filter>
+ </None>
+@@ -1168,24 +1156,12 @@
+ <None Include="..\..\Media\materials\textures\grass_1024.jpg">
+ <Filter>Assets\media</Filter>
+ </None>
+- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds">
+- <Filter>Assets\media</Filter>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds">
+- <Filter>Assets\media</Filter>
+- </None>
+ <None Include="..\..\Media\materials\textures\SSAO\gray256.png">
+ <Filter>Assets\media</Filter>
+ </None>
+ <None Include="..\..\Media\materials\textures\GreenSkin.jpg">
+ <Filter>Assets\media</Filter>
+ </None>
+- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds">
+- <Filter>Assets\media</Filter>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds">
+- <Filter>Assets\media</Filter>
+- </None>
+ <None Include="..\..\Media\materials\programs\HLSL\hdr.hlsl">
+ <Filter>Assets\media</Filter>
+ </None>
+@@ -1492,9 +1468,6 @@
+ <None Include="..\..\Media\materials\textures\TextureAtlasSampleWrap0.png">
+ <Filter>Assets\media</Filter>
+ </None>
+- <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt">
+- <Filter>Assets\media</Filter>
+- </None>
+ <None Include="..\..\Media\thumbnails\thumb_bezier.png">
+ <Filter>Assets\media</Filter>
+ </None>
+@@ -1658,4 +1631,4 @@
+ <Filter>Assets\media</Filter>
+ </None>
+ </ItemGroup>
+-</Project>
+\ No newline at end of file
++</Project>
+diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj
+--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-01-15 01:56:25.896045457 -0200
++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-01-21 21:53:56.997551091 -0200
+@@ -4356,21 +4356,6 @@
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+ </None>
+- <None Include="..\..\Media\packs\chiropteraDM.pk3">
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+- </None>
+ <None Include="..\..\Media\packs\cubemap.zip">
+ <DeploymentContent>true</DeploymentContent>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+@@ -6443,96 +6428,6 @@
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+ </None>
+- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+- </None>
+ <None Include="..\..\Media\materials\textures\ogreborder.png">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+@@ -9014,36 +8909,6 @@
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+ </None>
+- <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+- </None>
+- <None Include="..\..\Media\packs\chiropteraDM.txt">
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+- <DeploymentContent>true</DeploymentContent>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+- </None>
+ <None Include="..\..\Media\RTShaderLib\cache\dummy.txt">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+@@ -9264,4 +9129,4 @@
+ <Import Condition="'$(Configuration)'=='Phone Debug' or '$(Configuration)'=='Phone Release'" Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+-</Project>
+\ No newline at end of file
++</Project>
+diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters
+--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-01-15 01:56:25.899378571 -0200
++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-01-21 21:54:56.166945128 -0200
+@@ -731,9 +731,6 @@
+ <None Include="..\..\Media\models\Barrel.mesh">
+ <Filter>Assets\media</Filter>
+ </None>
+- <None Include="..\..\Media\packs\chiropteraDM.pk3">
+- <Filter>Assets\media</Filter>
+- </None>
+ <None Include="..\..\Media\models\column.mesh">
+ <Filter>Assets\media</Filter>
+ </None>
+@@ -1154,9 +1151,6 @@
+ <None Include="..\..\Media\materials\textures\checker.png">
+ <Filter>Assets\media</Filter>
+ </None>
+- <None Include="..\..\Media\packs\chiropteraDM.txt">
+- <Filter>Assets\media</Filter>
+- </None>
+ <None Include="..\..\Media\materials\textures\Chrome.jpg">
+ <Filter>Assets\media</Filter>
+ </None>
+@@ -1184,12 +1178,6 @@
+ <None Include="..\..\Media\materials\textures\dirt01.jpg">
+ <Filter>Assets\media</Filter>
+ </None>
+- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds">
+- <Filter>Assets\media</Filter>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds">
+- <Filter>Assets\media</Filter>
+- </None>
+ <None Include="..\..\Media\materials\textures\dkyellow.png">
+ <Filter>Assets\media</Filter>
+ </None>
+@@ -1247,24 +1235,12 @@
+ <None Include="..\..\Media\materials\textures\grass_1024.jpg">
+ <Filter>Assets\media</Filter>
+ </None>
+- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds">
+- <Filter>Assets\media</Filter>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds">
+- <Filter>Assets\media</Filter>
+- </None>
+ <None Include="..\..\Media\materials\textures\SSAO\gray256.png">
+ <Filter>Assets\media</Filter>
+ </None>
+ <None Include="..\..\Media\materials\textures\GreenSkin.jpg">
+ <Filter>Assets\media</Filter>
+ </None>
+- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds">
+- <Filter>Assets\media</Filter>
+- </None>
+- <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds">
+- <Filter>Assets\media</Filter>
+- </None>
+ <None Include="..\..\Media\materials\programs\HLSL\hdr.hlsl">
+ <Filter>Assets\media</Filter>
+ </None>
+@@ -1571,9 +1547,6 @@
+ <None Include="..\..\Media\materials\textures\TextureAtlasSampleWrap0.png">
+ <Filter>Assets\media</Filter>
+ </None>
+- <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt">
+- <Filter>Assets\media</Filter>
+- </None>
+ <None Include="..\..\Media\thumbnails\thumb_bezier.png">
+ <Filter>Assets\media</Filter>
+ </None>
+@@ -1775,4 +1748,4 @@
+ <Filter>Assets\for WMAppManifest</Filter>
+ </Image>
+ </ItemGroup>
+-</Project>
+\ No newline at end of file
++</Project>
+diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt
+--- ogre.orig/Samples/CMakeLists.txt 2014-01-15 01:56:25.932709706 -0200
++++ ogre/Samples/CMakeLists.txt 2014-01-21 21:23:53.145016405 -0200
+@@ -238,7 +238,6 @@
+ set(OGRE_MEDIA_DIR_TMP ${OGRE_MEDIA_DIR_REL})
+ set(OGRE_MEDIA_DIR_REL "Media")
+ configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg @ONLY)
+- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/quakemap.cfg @ONLY)
+ # restore
+ set(OGRE_MEDIA_DIR_REL ${OGRE_MEDIA_DIR_TMP})
+ add_custom_target(demo_installer
+diff -Nur ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h ogre/Samples/EndlessWorld/include/EndlessWorld.h
+--- ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h 2014-01-15 01:56:26.186026332 -0200
++++ ogre/Samples/EndlessWorld/include/EndlessWorld.h 2014-01-21 21:51:44.043058960 -0200
+@@ -304,17 +304,6 @@
+ defaultimp.inputScale = 600;
+ defaultimp.minBatchSize = 33;
+ defaultimp.maxBatchSize = 65;
+- // textures
+- defaultimp.layerList.resize(3);
+- defaultimp.layerList[0].worldSize = 100;
+- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds");
+- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds");
+- defaultimp.layerList[1].worldSize = 30;
+- defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds");
+- defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds");
+- defaultimp.layerList[2].worldSize = 200;
+- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
+- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds");
+ }
+
+ /*-----------------------------------------------------------------------------
+diff -Nur ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material ogre/Samples/Media/volumeTerrain/triplanarReference.material
+--- ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material 2014-01-15 01:56:27.849249967 -0200
++++ ogre/Samples/Media/volumeTerrain/triplanarReference.material 2014-01-21 22:24:19.433708607 -0200
+@@ -11,36 +11,6 @@
+ fragment_program_ref TriplanarReferenceHigh_PS
+ {
+ }
+- texture_unit
+- {
+- texture_alias fromX
+- texture dirt_grayrocky_diffusespecular.dds
+- }
+- texture_unit
+- {
+- texture_alias fromXNormal
+- texture dirt_grayrocky_normalheight.dds
+- }
+- texture_unit
+- {
+- texture_alias fromY
+- texture grass_green-01_diffusespecular.dds
+- }
+- texture_unit
+- {
+- texture_alias fromYNormal
+- texture grass_green-01_normalheight.dds
+- }
+- texture_unit
+- {
+- texture_alias fromZ
+- texture growth_weirdfungus-03_diffusespecular.dds
+- }
+- texture_unit
+- {
+- texture_alias fromZNormal
+- texture growth_weirdfungus-03_normalheight.dds
+- }
+ }
+ }
+ }
+@@ -57,36 +27,6 @@
+ fragment_program_ref TriplanarReferenceLow_PS
+ {
+ }
+- texture_unit
+- {
+- texture_alias fromX
+- texture dirt_grayrocky_diffusespecular.dds
+- }
+- texture_unit
+- {
+- texture_alias fromXNormal
+- texture dirt_grayrocky_normalheight.dds
+- }
+- texture_unit
+- {
+- texture_alias fromY
+- texture grass_green-01_diffusespecular.dds
+- }
+- texture_unit
+- {
+- texture_alias fromYNormal
+- texture grass_green-01_normalheight.dds
+- }
+- texture_unit
+- {
+- texture_alias fromZ
+- texture growth_weirdfungus-03_diffusespecular.dds
+- }
+- texture_unit
+- {
+- texture_alias fromZNormal
+- texture growth_weirdfungus-03_normalheight.dds
+- }
+ }
+ }
+ }
+@@ -101,4 +41,4 @@
+ diffuse 1.0 1.0 1.0
+ }
+ }
+-}
+\ No newline at end of file
++}
+diff -Nur ogre.orig/Samples/Terrain/include/Terrain.h ogre/Samples/Terrain/include/Terrain.h
+--- ogre.orig/Samples/Terrain/include/Terrain.h 2014-01-15 01:56:28.209226225 -0200
++++ ogre/Samples/Terrain/include/Terrain.h 2014-01-21 21:55:51.099952029 -0200
+@@ -533,17 +533,6 @@
+ defaultimp.inputScale = 600;
+ defaultimp.minBatchSize = 33;
+ defaultimp.maxBatchSize = 65;
+- // textures
+- defaultimp.layerList.resize(3);
+- defaultimp.layerList[0].worldSize = 100;
+- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds");
+- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds");
+- defaultimp.layerList[1].worldSize = 30;
+- defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds");
+- defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds");
+- defaultimp.layerList[2].worldSize = 200;
+- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
+- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds");
+
+
+ }
+diff -Nur ogre.orig/Tests/PlayPen/src/PlayPen.cpp ogre/Tests/PlayPen/src/PlayPen.cpp
+--- ogre.orig/Tests/PlayPen/src/PlayPen.cpp 2014-01-15 01:56:28.309219629 -0200
++++ ogre/Tests/PlayPen/src/PlayPen.cpp 2014-01-21 22:31:02.415114645 -0200
+@@ -411,16 +411,6 @@
+ // mTerrain->update();
+ // updateDelay = 0.3;
+ // }
+-// /*
+-// if (mKeyboard->isKeyDown(OIS::KC_M) && updateDelay <= 0)
+-// {
+-// StringVector texNames;
+-// texNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
+-// texNames.push_back("growth_weirdfungus-03_normalheight.dds");
+-// mTerrain->addLayer(500, &texNames);
+-// updateDelay = 0.3;
+-// }
+-// */
+ // updateDelay -= evt.timeSinceLastFrame;
+ // }
+ //#endif
+@@ -8185,17 +8175,6 @@
+ // imp.inputScale = 600;
+ // imp.minBatchSize = 33;
+ // imp.maxBatchSize = 65;
+-// // textures
+-// imp.layerList.resize(3);
+-// imp.layerList[0].worldSize = 100;
+-// imp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds");
+-// imp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds");
+-// imp.layerList[1].worldSize = 30;
+-// imp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds");
+-// imp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds");
+-// imp.layerList[2].worldSize = 200;
+-// imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
+-// imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds");
+ // terrain->prepare(imp);
+ // terrain->load();
+ //
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index 17917185e..7055b9d4f 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103998 2014-01-14 14:56:47Z spupykin $
+# $Id: PKGBUILD 104461 2014-01-21 08:35:40Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -11,7 +11,7 @@ _pkgname=xbmc
pkgname=xbmc-libre
pkgver=12.3
_codename=Frodo
-pkgrel=6
+pkgrel=7
pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation"
arch=('i686' 'x86_64')
url="http://xbmc.org"
@@ -27,7 +27,7 @@ makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libc
optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
'lirc-libre: remote controller support'
'udisks: automount external drives'
- 'upower: used to trigger suspend functionality'
+ 'upower: used to trigger power management functionality'
'libarchive: access compressed files without unpacking them'
'xorg-xinit: autostart xbmc')
install="${_pkgname}.install"
@@ -40,7 +40,7 @@ source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
"libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
md5sums=('7ae385ebf8e5cfcb917393235e6efbdb'
'8312d6d4ac5d7c3d9eed40ab08a17d3b'
- 'd4cbb6609c8e7b713c714241f529000e'
+ '02f7951824ee13103344f36009c0ef2a'
'7fd6399d2ffbdf06b724f0cc2efa0784')
prepare() {
@@ -121,7 +121,7 @@ package() {
done
install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
- install -Dm0644 $srcdir/polkit.rules $pkgdir/etc/polkit-1/rules.d/10-xbmc.rules
- chmod 0700 $pkgdir/etc/polkit-1/rules.d/
+ install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules
+ chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/xbmc-libre/polkit.rules b/libre/xbmc-libre/polkit.rules
index 5bc7e69f5..4b6d0fda0 100644
--- a/libre/xbmc-libre/polkit.rules
+++ b/libre/xbmc-libre/polkit.rules
@@ -1,11 +1,12 @@
polkit.addRule(function(action, subject) {
- if (action.id.match("org.freedesktop.login1.") && subject.isInGroup("power")) {
- return polkit.Result.YES;
- }
-});
-
-polkit.addRule(function(action, subject) {
- if (action.id.indexOf("org.freedesktop.udisks") == 0 && subject.isInGroup("storage")) {
- return polkit.Result.YES;
- }
+ if (subject.user == "xbmc") {
+ polkit.log("action=" + action);
+ polkit.log("subject=" + subject);
+ if (action.id.indexOf("org.freedesktop.login1.") == 0) {
+ return polkit.Result.YES;
+ }
+ if (action.id.indexOf("org.freedesktop.udisks.") == 0) {
+ return polkit.Result.YES;
+ }
+ }
});
diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install
index 04396af45..7fc45751a 100644
--- a/libre/xbmc-libre/xbmc.install
+++ b/libre/xbmc-libre/xbmc.install
@@ -1,10 +1,10 @@
post_install() {
[[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
[[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
- getent group xbmc > /dev/null || groupadd xbmc
- getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
+ getent group xbmc > /dev/null || groupadd -r xbmc
+ getent passwd xbmc > /dev/null || useradd -r -m -d /var/lib/xbmc -g xbmc xbmc
usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
- chown -R 102:0 etc/polkit-1
+ chown -R xbmc:xbmc var/lib/xbmc
}
post_upgrade() {
@@ -12,6 +12,7 @@ post_upgrade() {
}
post_remove() {
- post_install $1
- echo "You may want to remove xbmc user and group"
+ [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
+ [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
+ getent passwd xbmc > /dev/null || userdel xbmc
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2025-02-21 12:20:39 +0000