From 8bafb162b9546cee075e293caec2c281958601ab Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 4 Sep 2014 21:55:11 -0300 Subject: povray: remove libre suffix and add complex pkgrel --- libre/povray-libre/PKGBUILD | 73 ---------------------- libre/povray-libre/povray3.7.0_rc3-user-conf.patch | 27 -------- libre/povray/PKGBUILD | 72 +++++++++++++++++++++ libre/povray/povray3.7.0_rc3-user-conf.patch | 27 ++++++++ 4 files changed, 99 insertions(+), 100 deletions(-) delete mode 100644 libre/povray-libre/PKGBUILD delete mode 100644 libre/povray-libre/povray3.7.0_rc3-user-conf.patch create mode 100644 libre/povray/PKGBUILD create mode 100644 libre/povray/povray3.7.0_rc3-user-conf.patch (limited to 'libre') diff --git a/libre/povray-libre/PKGBUILD b/libre/povray-libre/PKGBUILD deleted file mode 100644 index e68afa864..000000000 --- a/libre/povray-libre/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 101605 2013-11-29 04:23:22Z eric $ -# Maintainer (Arch): Alexander Rødseth -# Contributor (Arch): Tom Newsom -# Contributor (Arch): tobias -# Contributor (Arch): red_over_blue -# Contributor (Arch): neri - -# Maintainer: Márcio Silva -# Don't build povray before 3.7 version (that ones are nonfree software) - -_pkgname=povray -pkgname=$_pkgname-libre -pkgver=3.7 -pkgrel=4 -epoch=1 -pkgdesc='Script based raytracer for creating 3D graphics, without nonfree documentation' -arch=('x86_64' 'i686' 'mips64el') -license=('AGPL3') -url='http://povray.org/' -depends=('libtiff' 'libpng' 'boost-libs') -makedepends=('boost') -provides=("$_pkgname=$pkgver") -conflicts=("$_pkgname") -replaces=("$_pkgname") -backup=("etc/povray/$pkgver/povray.conf" - "etc/povray/$pkgver/povray.ini") -mksource=("https://github.com/POV-Ray/$_pkgname/archive/$pkgver-stable.zip") -source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-stable.tar.xz" - 'povray3.7.0_rc3-user-conf.patch') -mksha256sums=('1261d963327a4b04c09d56bbd7436d0062e6bf8363674e3fb4e240beefb5b5cb') -sha256sums=('ba2a867b8593689067143b23ebdccb8f8f46487244802d24d873517287b924f1' - '95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0') - -mksource() { - cd "$_pkgname-$pkgver-stable" - - # remove nonfree documentation - rm -rv doc -} - -prepare() { - cd "$_pkgname-$pkgver-stable" - - cd unix - sed 's/automake --w/automake --add-missing --w/g' -i prebuild.sh - sed 's/dist-bzip2/dist-bzip2 subdir-objects/g' -i configure.ac - ./prebuild.sh - cd .. - ./bootstrap - patch -p1 < "$srcdir/povray3.7.0_rc3-user-conf.patch" -} - -build() { - cd "$_pkgname-$pkgver-stable" - - ./configure LIBS="-lboost_system -lboost_thread" COMPILED_BY='Parabola GNU/Linux-libre' \ - --prefix=/usr --sysconfdir=/etc - make CXXFLAGS+="-w -lboost_system -lboost_thread" - gzip -f povray.1 -} - -package() { - cd "$_pkgname-$pkgver-stable" - - install -d "$pkgdir/usr/share/$_pkgname-$pkgver" - cp -r icons include ini scenes scripts "$pkgdir/usr/share/$_pkgname-$pkgver" - install -Dm755 unix/povray "$pkgdir/usr/bin/povray" - install -Dm644 povray.conf "$pkgdir/etc/povray/$pkgver/povray.conf" - install -Dm644 povray.ini "$pkgdir/etc/povray/$pkgver/povray.ini" - install -Dm644 povray.1.gz "$pkgdir/usr/share/man/man1/povray.1.gz" -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/povray-libre/povray3.7.0_rc3-user-conf.patch b/libre/povray-libre/povray3.7.0_rc3-user-conf.patch deleted file mode 100644 index f20d9b506..000000000 --- a/libre/povray-libre/povray3.7.0_rc3-user-conf.patch +++ /dev/null @@ -1,27 +0,0 @@ - Makefile.am | 13 ------------- - 1 files changed, 0 insertions(+), 13 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 76b394c..9822c52 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -107,19 +107,6 @@ install-data-local: - for f in $$filelist ; do \ - $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \ - done -- @echo "Creating user directories..."; \ -- for p in $(povuser) $(povconfuser) ; do \ -- $(mkdir_p) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \ -- done -- @echo "Copying user configuration and INI files..."; \ -- for f in povray.conf povray.ini ; do \ -- if test -f $(povconfuser)/$$f; then \ -- echo "Creating backup of $(povconfuser)/$$f"; \ -- mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \ -- fi; \ -- done; \ -- $(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf && echo "$(povconfuser)/povray.conf" >> $(povinstall); \ -- $(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini && echo "$(povconfuser)/povray.ini" >> $(povinstall) - - # Remove data, config, and empty folders for 'make uninstall'. - # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts). diff --git a/libre/povray/PKGBUILD b/libre/povray/PKGBUILD new file mode 100644 index 000000000..281405cdb --- /dev/null +++ b/libre/povray/PKGBUILD @@ -0,0 +1,72 @@ +# $Id: PKGBUILD 101605 2013-11-29 04:23:22Z eric $ +# Maintainer (Arch): Alexander Rødseth +# Contributor (Arch): Tom Newsom +# Contributor (Arch): tobias +# Contributor (Arch): red_over_blue +# Contributor (Arch): neri + +# Maintainer: Márcio Silva +# Don't build povray before 3.7 version (that ones are nonfree software) + +_pkgname=povray-libre +pkgname=povray +pkgver=3.7 +pkgrel=4.parabola1 +epoch=1 +pkgdesc='Script based raytracer for creating 3D graphics, without nonfree documentation' +arch=('x86_64' 'i686' 'mips64el') +license=('AGPL3') +url='http://povray.org/' +depends=('libtiff' 'libpng' 'boost-libs') +makedepends=('boost') +conflicts=("$_pkgname") +replaces=("$_pkgname") +backup=("etc/povray/$pkgver/povray.conf" + "etc/povray/$pkgver/povray.ini") +mksource=("https://github.com/POV-Ray/$pkgname/archive/$pkgver-stable.zip") +source=("https://repo.parabolagnulinux.org/other/$_pkgname/$_pkgname-$pkgver-stable.tar.xz" + 'povray3.7.0_rc3-user-conf.patch') +mksha256sums=('1261d963327a4b04c09d56bbd7436d0062e6bf8363674e3fb4e240beefb5b5cb') +sha256sums=('ba2a867b8593689067143b23ebdccb8f8f46487244802d24d873517287b924f1' + '95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0') + +mksource() { + cd "$pkgname-$pkgver-stable" + + # remove nonfree documentation + rm -rv doc +} + +prepare() { + cd "$pkgname-$pkgver-stable" + + cd unix + sed 's/automake --w/automake --add-missing --w/g' -i prebuild.sh + sed 's/dist-bzip2/dist-bzip2 subdir-objects/g' -i configure.ac + ./prebuild.sh + cd .. + ./bootstrap + patch -p1 < "$srcdir/povray3.7.0_rc3-user-conf.patch" +} + +build() { + cd "$pkgname-$pkgver-stable" + + ./configure LIBS="-lboost_system -lboost_thread" COMPILED_BY='Parabola GNU/Linux-libre' \ + --prefix=/usr --sysconfdir=/etc + make CXXFLAGS+="-w -lboost_system -lboost_thread" + gzip -f povray.1 +} + +package() { + cd "$pkgname-$pkgver-stable" + + install -d "$pkgdir/usr/share/$pkgname-$pkgver" + cp -r icons include ini scenes scripts "$pkgdir/usr/share/$pkgname-$pkgver" + install -Dm755 unix/povray "$pkgdir/usr/bin/povray" + install -Dm644 povray.conf "$pkgdir/etc/povray/$pkgver/povray.conf" + install -Dm644 povray.ini "$pkgdir/etc/povray/$pkgver/povray.ini" + install -Dm644 povray.1.gz "$pkgdir/usr/share/man/man1/povray.1.gz" +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/povray/povray3.7.0_rc3-user-conf.patch b/libre/povray/povray3.7.0_rc3-user-conf.patch new file mode 100644 index 000000000..f20d9b506 --- /dev/null +++ b/libre/povray/povray3.7.0_rc3-user-conf.patch @@ -0,0 +1,27 @@ + Makefile.am | 13 ------------- + 1 files changed, 0 insertions(+), 13 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 76b394c..9822c52 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -107,19 +107,6 @@ install-data-local: + for f in $$filelist ; do \ + $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \ + done +- @echo "Creating user directories..."; \ +- for p in $(povuser) $(povconfuser) ; do \ +- $(mkdir_p) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \ +- done +- @echo "Copying user configuration and INI files..."; \ +- for f in povray.conf povray.ini ; do \ +- if test -f $(povconfuser)/$$f; then \ +- echo "Creating backup of $(povconfuser)/$$f"; \ +- mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \ +- fi; \ +- done; \ +- $(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf && echo "$(povconfuser)/povray.conf" >> $(povinstall); \ +- $(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini && echo "$(povconfuser)/povray.ini" >> $(povinstall) + + # Remove data, config, and empty folders for 'make uninstall'. + # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts). -- cgit v1.2.3 From 35f7581c202decb6716adca302099aa6e136f00f Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 4 Sep 2014 22:00:51 -0300 Subject: ponysay: remove libre suffix and add complex pkgrel --- libre/ponysay-libre/PKGBUILD | 49 -------------------------------------------- libre/ponysay/PKGBUILD | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 49 deletions(-) delete mode 100644 libre/ponysay-libre/PKGBUILD create mode 100644 libre/ponysay/PKGBUILD (limited to 'libre') diff --git a/libre/ponysay-libre/PKGBUILD b/libre/ponysay-libre/PKGBUILD deleted file mode 100644 index 8b68ab0fd..000000000 --- a/libre/ponysay-libre/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Maintainer (Arch): Sven-Hendrik Haase -# Contributor (Arch): Erkin Batu Altunbaş -# Maintainer: André Silva -# Contributor: Márcio Silva - -_pkgname=ponysay -pkgname=ponysay-libre -pkgver=3.0.2 -pkgrel=1 -pkgdesc="cowsay reimplemention for ponies, without nonfree pony graphics" -url="http://erkin.github.com/ponysay/" -arch=('any') -license=('GPL3') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -depends=('python' 'bash') -makedepends=('git') -mksource=("ponysay-$pkgver.tar.gz::https://github.com/erkin/ponysay/tarball/$pkgver") -source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz") -mkmd5sums=('84b04705a0a57b2f43327ac6b7952013') -md5sums=('0cf3f97b30a374f448747b7594179081') - -mksource() { - cd "$srcdir/erkin-ponysay-"* - - # Generate a nonfree pony graphics list to replace it with empty files - # NOTE: empty files are necessary for the building checking only, --freedom=strict will not include them for the packaging - grep -rIl 'FREE: sharable' | cat > nonfree-pony-graphics-list.txt - grep -rIl 'FREE: no' | cat >> nonfree-pony-graphics-list.txt - - # Remove nonfree pony graphics - rm -v $(grep -rIl 'FREE: sharable') - rm -v $(grep -rIl 'FREE: no') - - # Generate empty files - for x in $(cat nonfree-pony-graphics-list.txt); do - touch $x - done - - # Remove list - rm -v nonfree-pony-graphics-list.txt -} - -package() { - cd "$srcdir/erkin-ponysay-"* - - python3 setup.py --prefix=/usr --dest-dir=$pkgdir --freedom=strict --everything --with-pdf=/usr/share/doc/ponysay --without-pdf-compression install -} diff --git a/libre/ponysay/PKGBUILD b/libre/ponysay/PKGBUILD new file mode 100644 index 000000000..3248ea577 --- /dev/null +++ b/libre/ponysay/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer (Arch): Sven-Hendrik Haase +# Contributor (Arch): Erkin Batu Altunbaş +# Maintainer: André Silva +# Contributor: Márcio Silva + +_pkgname=ponysay-libre +pkgname=ponysay +pkgver=3.0.2 +pkgrel=1.parabola1 +pkgdesc="cowsay reimplemention for ponies, without nonfree pony graphics" +url="http://erkin.github.com/ponysay/" +arch=('any') +license=('GPL3') +replaces=($_pkgname) +conflicts=($_pkgname) +depends=('python' 'bash') +makedepends=('git') +mksource=("ponysay-$pkgver.tar.gz::https://github.com/erkin/ponysay/tarball/$pkgver") +source=("https://repo.parabolagnulinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz") +mkmd5sums=('84b04705a0a57b2f43327ac6b7952013') +md5sums=('0cf3f97b30a374f448747b7594179081') + +mksource() { + cd "$srcdir/erkin-ponysay-"* + + # Generate a nonfree pony graphics list to replace it with empty files + # NOTE: empty files are necessary for the building checking only, --freedom=strict will not include them for the packaging + grep -rIl 'FREE: sharable' | cat > nonfree-pony-graphics-list.txt + grep -rIl 'FREE: no' | cat >> nonfree-pony-graphics-list.txt + + # Remove nonfree pony graphics + rm -v $(grep -rIl 'FREE: sharable') + rm -v $(grep -rIl 'FREE: no') + + # Generate empty files + for x in $(cat nonfree-pony-graphics-list.txt); do + touch $x + done + + # Remove list + rm -v nonfree-pony-graphics-list.txt +} + +package() { + cd "$srcdir/erkin-ponysay-"* + + python3 setup.py --prefix=/usr --dest-dir=$pkgdir --freedom=strict --everything --with-pdf=/usr/share/doc/ponysay --without-pdf-compression install +} -- cgit v1.2.3 From 89c3e689a0a3348b23eeef904ba5fc936a92382c Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 4 Sep 2014 22:12:38 -0300 Subject: p7zip: remove libre suffix and add complex pkgrel --- libre/p7zip-libre/7zFM.desktop | 9 --- libre/p7zip-libre/PKGBUILD | 90 ---------------------- libre/p7zip-libre/install | 13 ---- libre/p7zip-libre/libre.patch | 170 ----------------------------------------- libre/p7zip/7zFM.desktop | 9 +++ libre/p7zip/PKGBUILD | 89 +++++++++++++++++++++ libre/p7zip/install | 13 ++++ libre/p7zip/libre.patch | 170 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 281 insertions(+), 282 deletions(-) delete mode 100644 libre/p7zip-libre/7zFM.desktop delete mode 100644 libre/p7zip-libre/PKGBUILD delete mode 100644 libre/p7zip-libre/install delete mode 100644 libre/p7zip-libre/libre.patch create mode 100644 libre/p7zip/7zFM.desktop create mode 100644 libre/p7zip/PKGBUILD create mode 100644 libre/p7zip/install create mode 100644 libre/p7zip/libre.patch (limited to 'libre') diff --git a/libre/p7zip-libre/7zFM.desktop b/libre/p7zip-libre/7zFM.desktop deleted file mode 100644 index 62b8e8562..000000000 --- a/libre/p7zip-libre/7zFM.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=7-Zip FM -GenericName=7-Zip File Manager -Type=Application -Categories=GTK;Utility;Archiving;Compression; -Terminal=false -Icon=p7zip -Exec=7zFM diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD deleted file mode 100644 index 98c91718e..000000000 --- a/libre/p7zip-libre/PKGBUILD +++ /dev/null @@ -1,90 +0,0 @@ -# $Id: PKGBUILD 203246 2014-01-06 19:32:24Z bpiotrowski $ -# Contributor (Arch): Thayer Williams -# Contributor (Arch): Hugo Doria -# Contributor (Arch): TuxSpirit 2007/11/17 21:22:36 UTC -# Contributor (Arch): Daniel J Griffiths -# Maintainer (Arch): Gaetan Bisson - -pkgname=p7zip-libre -_pkgname=${pkgname%-libre} -pkgver=9.20.1 -pkgrel=9.4 -pkgdesc='Command-line version of the 7zip compressed file archiver, without nonfree decompression engine for RAR archives' -url='http://p7zip.sourceforge.net/' -license=('GPL') -arch=('i686' 'x86_64' 'mips64el') -provides=("p7zip=$pkgver") -conflicts=('p7zip') -replaces=('p7zip') -depends=('gcc-libs' 'bash') -optdepends=('wxgtk2.8: GUI' - 'desktop-file-utils: desktop entries') -makedepends=('yasm' 'nasm' 'wxgtk2.8') -mksource=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2") -source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}_${pkgver}_src_all.tar.bz2" - '7zFM.desktop' 'libre.patch') -mksha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7') -sha1sums=('4e5ba097a90f3e00ad072023030c87f0707733b8' - 'f2c370d6f1b286b7ce9a2804e22541b755616a40' - 'bd929fdcbc05dcc783f7fa7d156ed15d38b0b4b3') - -options=('!makeflags') -install=install - -mksource() { - cd "${srcdir}/${_pkgname}_${pkgver}" - - # Remove nonfree unRAR utility files from the source - rm -rv CPP/7zip/{Archive,Compress}/Rar - rm -v CPP/7zip/Compress/{Rar{2,3}Decoder.{cpp,h},Rar3Vm.{cpp,h},RarCodecsRegister.cpp} - rm -v CPP/7zip/Crypto/{Rar20Crypto,RarAes}.{cpp,h} - rm -v DOCS/unRarLicense.txt - - # Remove nonfree parent folder icon - rm CPP/7zip/UI/FileManager/res/ParentFolder.h -} - -prepare() { - cd "${srcdir}/${_pkgname}_${pkgver}" - - # remove rar and parent folder icon references - patch -Np1 -i ../libre.patch - - rm GUI/kde4/p7zip_compress.desktop - [[ $CARCH = x86_64 ]] \ - && cp makefile.linux_amd64_asm makefile.machine \ - || cp makefile.linux_x86_asm_gcc_4.X makefile.machine - - sed -i 's/wx-config/wx-config-2.8/g' CPP/7zip/TEST/TestUI/makefile \ - CPP/7zip/UI/{FileManager,GUI,P7ZIP}/makefile -} - -build() { - cd "${srcdir}/${_pkgname}_${pkgver}" - make all4 OPTFLAGS="${CXXFLAGS}" -} - -package() { - cd "${srcdir}/${_pkgname}_${pkgver}" - make install \ - DEST_DIR="${pkgdir}" \ - DEST_HOME="/usr" \ - DEST_MAN="/usr/share/man" - - # Licenses - install -d "${pkgdir}"/usr/share/licenses/p7zip - ln -s -t "${pkgdir}"/usr/share/licenses/p7zip \ - /usr/share/doc/p7zip/DOCS/License.txt - - # Integration with stuff... - install -Dm644 GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png - install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus} - cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/ - cp ../7zFM.desktop "${pkgdir}"/usr/share/applications/ - ln -s 7zCon.sfx "${pkgdir}"/usr/lib/p7zip/7z.sfx - - find GUI/help -type d -exec chmod 755 {} \; - cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/ - - chmod -R u+w "${pkgdir}/usr" -} diff --git a/libre/p7zip-libre/install b/libre/p7zip-libre/install deleted file mode 100644 index 7f3cc4358..000000000 --- a/libre/p7zip-libre/install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true - [[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true -} - -post_upgrade() { - post_install -} - - -post_remove() { - post_install -} diff --git a/libre/p7zip-libre/libre.patch b/libre/p7zip-libre/libre.patch deleted file mode 100644 index 86b2caebc..000000000 --- a/libre/p7zip-libre/libre.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff -Nur p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile ---- p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile 2010-11-07 13:41:43.000000000 -0200 -+++ p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile 2014-05-03 11:19:47.618563272 -0300 -@@ -158,14 +158,6 @@ - NsisIn.o \ - NsisRegister.o \ - --RAR_OBJS = \ -- RarHandler.o \ -- RarHeader.o \ -- RarIn.o \ -- RarItem.o \ -- RarVolumeInStream.o \ -- RarRegister.o \ -- - TAR_OBJS = \ - TarHandler.o \ - TarHandlerOut.o \ -@@ -243,13 +235,6 @@ - ZlibEncoder.o \ - ZDecoder.o \ - --COMPRESS_OBJS_NON_FREE = \ -- Rar1Decoder.o \ -- Rar2Decoder.o \ -- Rar3Decoder.o \ -- Rar3Vm.o \ -- RarCodecsRegister.o \ -- - CRYPTO_OBJS = \ - 7zAes.o \ - 7zAesRegister.o \ -@@ -257,8 +242,6 @@ - MyAes.o \ - Pbkdf2HmacSha1.o \ - RandGen.o \ -- Rar20Crypto.o \ -- RarAes.o \ - Sha1.o \ - WzAes.o \ - ZipCrypto.o \ -diff -Nur p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/FM_rc.cpp p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp ---- p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/FM_rc.cpp 2010-11-07 13:55:36.000000000 -0200 -+++ p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp 2014-05-03 11:28:17.542065931 -0300 -@@ -774,8 +774,6 @@ - - ///////////////////////////////////////////////////// - --#include "res/ParentFolder.h" -- - SevenZipPanel::SevenZipPanel(MyFrame *frame, wxWindow *parent,int id,int panelIndex) : - wxPanel(parent,id) , m_frame(frame), _wList(0) - { -@@ -793,7 +791,7 @@ - int sizes[] = {150, 250, 350, -1}; - wxArrayString pathArray; - wxBoxSizer *pPathSizer = new wxBoxSizer(wxHORIZONTAL); -- m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxGetBitmapFromMemory(PARENT_FOLDER), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW); -+ m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_TOOLBAR, wxDefaultSize), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW); - m_pComboBoxPath = new wxComboBox(this, _comboBoxID, wxEmptyString, wxDefaultPosition, wxSize(300,-1), pathArray, wxCB_DROPDOWN | wxCB_SORT ); - pPathSizer->Add(m_pBmpButtonParentFolder, 0, wxALL|wxEXPAND, 0); - pPathSizer->Add(m_pComboBoxPath, 1, wxALL|wxEXPAND, 5); -diff -Nur p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/makefile.depend p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend ---- p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/makefile.depend 2011-02-19 07:33:17.000000000 -0200 -+++ p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend 2014-05-03 11:28:17.545399286 -0300 -@@ -714,7 +714,7 @@ - res/Move2PNG.h res/DeletePNG.h res/Delete2PNG.h res/InfoPNG.h \ - res/Info2PNG.h LangUtils.h ../../../Common/Lang.h \ - ../../../Common/MyString.h ../../../Windows/ResourceString.h \ -- /usr/include/wx-2.8/wx/mstream.h res/ParentFolder.h -+ /usr/include/wx-2.8/wx/mstream.h - OpenCallback.o: OpenCallback.cpp ../../../myWindows/StdAfx.h \ - ../../../myWindows/config.h ../../../Common/MyWindows.h \ - ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -diff -Nur p7zip_9.20.1.orig/makefile p7zip_9.20.1/makefile ---- p7zip_9.20.1.orig/makefile 2011-03-13 08:52:45.000000000 -0300 -+++ p7zip_9.20.1/makefile 2014-05-03 11:19:47.618563272 -0300 -@@ -56,7 +56,6 @@ - $(MAKE) -C CPP/7zip/UI/Client7z depend - $(MAKE) -C CPP/7zip/UI/Console depend - $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend -- $(MAKE) -C CPP/7zip/Compress/Rar depend - $(MAKE) -C CPP/7zip/UI/GUI depend - $(MAKE) -C CPP/7zip/UI/FileManager depend - $(MAKE) -C check/my_86_filter depend -@@ -68,7 +67,6 @@ - common7z:common - $(MKDIR) bin/Codecs - $(MAKE) -C CPP/7zip/Bundles/Format7zFree all -- $(MAKE) -C CPP/7zip/Compress/Rar all - - 7z: common7z - $(MAKE) -C CPP/7zip/UI/Console all -@@ -93,7 +91,6 @@ - $(MAKE) -C CPP/7zip/UI/FileManager clean - $(MAKE) -C CPP/7zip/UI/GUI clean - $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean -- $(MAKE) -C CPP/7zip/Compress/Rar clean - $(MAKE) -C CPP/7zip/Compress/LZMA_Alone clean - $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean - $(MAKE) -C CPP/7zip/TEST/TestUI clean -diff -Nur p7zip_9.20.1.orig/makefile.oldmake p7zip_9.20.1/makefile.oldmake ---- p7zip_9.20.1.orig/makefile.oldmake 2011-03-13 08:53:08.000000000 -0300 -+++ p7zip_9.20.1/makefile.oldmake 2014-05-03 11:19:47.618563272 -0300 -@@ -56,7 +56,6 @@ - cd CPP/7zip/UI/Client7z ; $(MAKE) depend - cd CPP/7zip/UI/Console ; $(MAKE) depend - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend -- cd CPP/7zip/Compress/Rar ; $(MAKE) depend - cd CPP/7zip/UI/GUI ; $(MAKE) depend - cd CPP/7zip/UI/FileManager ; $(MAKE) depend - cd check/my_86_filter ; $(MAKE) depend -@@ -68,7 +67,6 @@ - common7z:common - $(MKDIR) bin/Codecs - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all -- cd CPP/7zip/Compress/Rar ; $(MAKE) all - - 7z: common7z - cd CPP/7zip/UI/Console ; $(MAKE) all -@@ -93,7 +91,6 @@ - cd CPP/7zip/UI/FileManager ; $(MAKE) clean - cd CPP/7zip/UI/GUI ; $(MAKE) clean - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean -- cd CPP/7zip/Compress/Rar ; $(MAKE) clean - cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean - cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean - cd CPP/7zip/TEST/TestUI ; $(MAKE) clean -diff -Nur p7zip_9.20.1.orig/makefile.qnx_shared.so p7zip_9.20.1/makefile.qnx_shared.so ---- p7zip_9.20.1.orig/makefile.qnx_shared.so 2007-06-28 04:34:14.000000000 -0300 -+++ p7zip_9.20.1/makefile.qnx_shared.so 2014-05-03 11:19:47.618563272 -0300 -@@ -1,5 +1,4 @@ - ################################################### --# makefile.machine for "7z.so , Codecs/Rar29.so" : - # tested with p7zip-4.47_beta on qnx-6.3.0 sp3 x86 target - - OPTFLAGS=-O -diff -Nur p7zip_9.20.1.orig/makefile.rules p7zip_9.20.1/makefile.rules ---- p7zip_9.20.1.orig/makefile.rules 2010-11-07 14:08:51.000000000 -0200 -+++ p7zip_9.20.1/makefile.rules 2014-05-03 11:19:47.621896630 -0300 -@@ -448,18 +448,6 @@ - NsisRegister.o : ../../Archive/Nsis/NsisRegister.cpp - $(CXX) $(CXXFLAGS) ../../Archive/Nsis/NsisRegister.cpp - --RarHandler.o : ../../Archive/Rar/RarHandler.cpp -- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHandler.cpp --RarHeader.o : ../../Archive/Rar/RarHeader.cpp -- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHeader.cpp --RarIn.o : ../../Archive/Rar/RarIn.cpp -- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarIn.cpp --RarItem.o : ../../Archive/Rar/RarItem.cpp -- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarItem.cpp --RarVolumeInStream.o : ../../Archive/Rar/RarVolumeInStream.cpp -- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp --RarRegister.o : ../../Archive/Rar/RarRegister.cpp -- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarRegister.cpp - - UdfHandler.o : ../../Archive/Udf/UdfHandler.cpp - $(CXX) $(CXXFLAGS) ../../Archive/Udf/UdfHandler.cpp -@@ -535,10 +523,6 @@ - $(CXX) $(CXXFLAGS) ../../Crypto/7zAesRegister.cpp - WzAes.o : ../../Crypto/WzAes.cpp - $(CXX) $(CXXFLAGS) ../../Crypto/WzAes.cpp --Rar20Crypto.o : ../../Crypto/Rar20Crypto.cpp -- $(CXX) $(CXXFLAGS) ../../Crypto/Rar20Crypto.cpp --RarAes.o : ../../Crypto/RarAes.cpp -- $(CXX) $(CXXFLAGS) ../../Crypto/RarAes.cpp - HmacSha1.o : ../../Crypto/HmacSha1.cpp - $(CXX) $(CXXFLAGS) ../../Crypto/HmacSha1.cpp - Pbkdf2HmacSha1.o : ../../Crypto/Pbkdf2HmacSha1.cpp diff --git a/libre/p7zip/7zFM.desktop b/libre/p7zip/7zFM.desktop new file mode 100644 index 000000000..62b8e8562 --- /dev/null +++ b/libre/p7zip/7zFM.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=7-Zip FM +GenericName=7-Zip File Manager +Type=Application +Categories=GTK;Utility;Archiving;Compression; +Terminal=false +Icon=p7zip +Exec=7zFM diff --git a/libre/p7zip/PKGBUILD b/libre/p7zip/PKGBUILD new file mode 100644 index 000000000..b34262451 --- /dev/null +++ b/libre/p7zip/PKGBUILD @@ -0,0 +1,89 @@ +# $Id: PKGBUILD 203246 2014-01-06 19:32:24Z bpiotrowski $ +# Contributor (Arch): Thayer Williams +# Contributor (Arch): Hugo Doria +# Contributor (Arch): TuxSpirit 2007/11/17 21:22:36 UTC +# Contributor (Arch): Daniel J Griffiths +# Maintainer (Arch): Gaetan Bisson + +_pkgname=p7zip-libre +pkgname=p7zip +pkgver=9.20.1 +pkgrel=9.parabola1 +pkgdesc='Command-line version of the 7zip compressed file archiver, without nonfree decompression engine for RAR archives' +url='http://p7zip.sourceforge.net/' +license=('GPL') +arch=('i686' 'x86_64' 'mips64el') +conflicts=('p7zip-libre') +replaces=('p7zip-libre') +depends=('gcc-libs' 'bash') +optdepends=('wxgtk2.8: GUI' + 'desktop-file-utils: desktop entries') +makedepends=('yasm' 'nasm' 'wxgtk2.8') +mksource=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2") +source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}_${pkgver}_src_all.tar.bz2" + '7zFM.desktop' 'libre.patch') +mksha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7') +sha1sums=('4e5ba097a90f3e00ad072023030c87f0707733b8' + 'f2c370d6f1b286b7ce9a2804e22541b755616a40' + 'bd929fdcbc05dcc783f7fa7d156ed15d38b0b4b3') + +options=('!makeflags') +install=install + +mksource() { + cd "${srcdir}/${pkgname}_${pkgver}" + + # Remove nonfree unRAR utility files from the source + rm -rv CPP/7zip/{Archive,Compress}/Rar + rm -v CPP/7zip/Compress/{Rar{2,3}Decoder.{cpp,h},Rar3Vm.{cpp,h},RarCodecsRegister.cpp} + rm -v CPP/7zip/Crypto/{Rar20Crypto,RarAes}.{cpp,h} + rm -v DOCS/unRarLicense.txt + + # Remove nonfree parent folder icon + rm CPP/7zip/UI/FileManager/res/ParentFolder.h +} + +prepare() { + cd "${srcdir}/${pkgname}_${pkgver}" + + # remove rar and parent folder icon references + patch -Np1 -i ../libre.patch + + rm GUI/kde4/p7zip_compress.desktop + [[ $CARCH = x86_64 ]] \ + && cp makefile.linux_amd64_asm makefile.machine \ + || cp makefile.linux_x86_asm_gcc_4.X makefile.machine + + sed -i 's/wx-config/wx-config-2.8/g' CPP/7zip/TEST/TestUI/makefile \ + CPP/7zip/UI/{FileManager,GUI,P7ZIP}/makefile +} + +build() { + cd "${srcdir}/${pkgname}_${pkgver}" + make all4 OPTFLAGS="${CXXFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}_${pkgver}" + make install \ + DEST_DIR="${pkgdir}" \ + DEST_HOME="/usr" \ + DEST_MAN="/usr/share/man" + + # Licenses + install -d "${pkgdir}"/usr/share/licenses/p7zip + ln -s -t "${pkgdir}"/usr/share/licenses/p7zip \ + /usr/share/doc/p7zip/DOCS/License.txt + + # Integration with stuff... + install -Dm644 GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png + install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus} + cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/ + cp ../7zFM.desktop "${pkgdir}"/usr/share/applications/ + ln -s 7zCon.sfx "${pkgdir}"/usr/lib/p7zip/7z.sfx + + find GUI/help -type d -exec chmod 755 {} \; + cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/ + + chmod -R u+w "${pkgdir}/usr" +} diff --git a/libre/p7zip/install b/libre/p7zip/install new file mode 100644 index 000000000..7f3cc4358 --- /dev/null +++ b/libre/p7zip/install @@ -0,0 +1,13 @@ +post_install() { + [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true + [[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true +} + +post_upgrade() { + post_install +} + + +post_remove() { + post_install +} diff --git a/libre/p7zip/libre.patch b/libre/p7zip/libre.patch new file mode 100644 index 000000000..86b2caebc --- /dev/null +++ b/libre/p7zip/libre.patch @@ -0,0 +1,170 @@ +diff -Nur p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile 2010-11-07 13:41:43.000000000 -0200 ++++ p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile 2014-05-03 11:19:47.618563272 -0300 +@@ -158,14 +158,6 @@ + NsisIn.o \ + NsisRegister.o \ + +-RAR_OBJS = \ +- RarHandler.o \ +- RarHeader.o \ +- RarIn.o \ +- RarItem.o \ +- RarVolumeInStream.o \ +- RarRegister.o \ +- + TAR_OBJS = \ + TarHandler.o \ + TarHandlerOut.o \ +@@ -243,13 +235,6 @@ + ZlibEncoder.o \ + ZDecoder.o \ + +-COMPRESS_OBJS_NON_FREE = \ +- Rar1Decoder.o \ +- Rar2Decoder.o \ +- Rar3Decoder.o \ +- Rar3Vm.o \ +- RarCodecsRegister.o \ +- + CRYPTO_OBJS = \ + 7zAes.o \ + 7zAesRegister.o \ +@@ -257,8 +242,6 @@ + MyAes.o \ + Pbkdf2HmacSha1.o \ + RandGen.o \ +- Rar20Crypto.o \ +- RarAes.o \ + Sha1.o \ + WzAes.o \ + ZipCrypto.o \ +diff -Nur p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/FM_rc.cpp p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp +--- p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/FM_rc.cpp 2010-11-07 13:55:36.000000000 -0200 ++++ p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp 2014-05-03 11:28:17.542065931 -0300 +@@ -774,8 +774,6 @@ + + ///////////////////////////////////////////////////// + +-#include "res/ParentFolder.h" +- + SevenZipPanel::SevenZipPanel(MyFrame *frame, wxWindow *parent,int id,int panelIndex) : + wxPanel(parent,id) , m_frame(frame), _wList(0) + { +@@ -793,7 +791,7 @@ + int sizes[] = {150, 250, 350, -1}; + wxArrayString pathArray; + wxBoxSizer *pPathSizer = new wxBoxSizer(wxHORIZONTAL); +- m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxGetBitmapFromMemory(PARENT_FOLDER), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW); ++ m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_TOOLBAR, wxDefaultSize), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW); + m_pComboBoxPath = new wxComboBox(this, _comboBoxID, wxEmptyString, wxDefaultPosition, wxSize(300,-1), pathArray, wxCB_DROPDOWN | wxCB_SORT ); + pPathSizer->Add(m_pBmpButtonParentFolder, 0, wxALL|wxEXPAND, 0); + pPathSizer->Add(m_pComboBoxPath, 1, wxALL|wxEXPAND, 5); +diff -Nur p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/makefile.depend p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend +--- p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/makefile.depend 2011-02-19 07:33:17.000000000 -0200 ++++ p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend 2014-05-03 11:28:17.545399286 -0300 +@@ -714,7 +714,7 @@ + res/Move2PNG.h res/DeletePNG.h res/Delete2PNG.h res/InfoPNG.h \ + res/Info2PNG.h LangUtils.h ../../../Common/Lang.h \ + ../../../Common/MyString.h ../../../Windows/ResourceString.h \ +- /usr/include/wx-2.8/wx/mstream.h res/ParentFolder.h ++ /usr/include/wx-2.8/wx/mstream.h + OpenCallback.o: OpenCallback.cpp ../../../myWindows/StdAfx.h \ + ../../../myWindows/config.h ../../../Common/MyWindows.h \ + ../../../Common/MyGuidDef.h ../../../Common/Types.h \ +diff -Nur p7zip_9.20.1.orig/makefile p7zip_9.20.1/makefile +--- p7zip_9.20.1.orig/makefile 2011-03-13 08:52:45.000000000 -0300 ++++ p7zip_9.20.1/makefile 2014-05-03 11:19:47.618563272 -0300 +@@ -56,7 +56,6 @@ + $(MAKE) -C CPP/7zip/UI/Client7z depend + $(MAKE) -C CPP/7zip/UI/Console depend + $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend +- $(MAKE) -C CPP/7zip/Compress/Rar depend + $(MAKE) -C CPP/7zip/UI/GUI depend + $(MAKE) -C CPP/7zip/UI/FileManager depend + $(MAKE) -C check/my_86_filter depend +@@ -68,7 +67,6 @@ + common7z:common + $(MKDIR) bin/Codecs + $(MAKE) -C CPP/7zip/Bundles/Format7zFree all +- $(MAKE) -C CPP/7zip/Compress/Rar all + + 7z: common7z + $(MAKE) -C CPP/7zip/UI/Console all +@@ -93,7 +91,6 @@ + $(MAKE) -C CPP/7zip/UI/FileManager clean + $(MAKE) -C CPP/7zip/UI/GUI clean + $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean +- $(MAKE) -C CPP/7zip/Compress/Rar clean + $(MAKE) -C CPP/7zip/Compress/LZMA_Alone clean + $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean + $(MAKE) -C CPP/7zip/TEST/TestUI clean +diff -Nur p7zip_9.20.1.orig/makefile.oldmake p7zip_9.20.1/makefile.oldmake +--- p7zip_9.20.1.orig/makefile.oldmake 2011-03-13 08:53:08.000000000 -0300 ++++ p7zip_9.20.1/makefile.oldmake 2014-05-03 11:19:47.618563272 -0300 +@@ -56,7 +56,6 @@ + cd CPP/7zip/UI/Client7z ; $(MAKE) depend + cd CPP/7zip/UI/Console ; $(MAKE) depend + cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend +- cd CPP/7zip/Compress/Rar ; $(MAKE) depend + cd CPP/7zip/UI/GUI ; $(MAKE) depend + cd CPP/7zip/UI/FileManager ; $(MAKE) depend + cd check/my_86_filter ; $(MAKE) depend +@@ -68,7 +67,6 @@ + common7z:common + $(MKDIR) bin/Codecs + cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all +- cd CPP/7zip/Compress/Rar ; $(MAKE) all + + 7z: common7z + cd CPP/7zip/UI/Console ; $(MAKE) all +@@ -93,7 +91,6 @@ + cd CPP/7zip/UI/FileManager ; $(MAKE) clean + cd CPP/7zip/UI/GUI ; $(MAKE) clean + cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean +- cd CPP/7zip/Compress/Rar ; $(MAKE) clean + cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean + cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean + cd CPP/7zip/TEST/TestUI ; $(MAKE) clean +diff -Nur p7zip_9.20.1.orig/makefile.qnx_shared.so p7zip_9.20.1/makefile.qnx_shared.so +--- p7zip_9.20.1.orig/makefile.qnx_shared.so 2007-06-28 04:34:14.000000000 -0300 ++++ p7zip_9.20.1/makefile.qnx_shared.so 2014-05-03 11:19:47.618563272 -0300 +@@ -1,5 +1,4 @@ + ################################################### +-# makefile.machine for "7z.so , Codecs/Rar29.so" : + # tested with p7zip-4.47_beta on qnx-6.3.0 sp3 x86 target + + OPTFLAGS=-O +diff -Nur p7zip_9.20.1.orig/makefile.rules p7zip_9.20.1/makefile.rules +--- p7zip_9.20.1.orig/makefile.rules 2010-11-07 14:08:51.000000000 -0200 ++++ p7zip_9.20.1/makefile.rules 2014-05-03 11:19:47.621896630 -0300 +@@ -448,18 +448,6 @@ + NsisRegister.o : ../../Archive/Nsis/NsisRegister.cpp + $(CXX) $(CXXFLAGS) ../../Archive/Nsis/NsisRegister.cpp + +-RarHandler.o : ../../Archive/Rar/RarHandler.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHandler.cpp +-RarHeader.o : ../../Archive/Rar/RarHeader.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHeader.cpp +-RarIn.o : ../../Archive/Rar/RarIn.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarIn.cpp +-RarItem.o : ../../Archive/Rar/RarItem.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarItem.cpp +-RarVolumeInStream.o : ../../Archive/Rar/RarVolumeInStream.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp +-RarRegister.o : ../../Archive/Rar/RarRegister.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarRegister.cpp + + UdfHandler.o : ../../Archive/Udf/UdfHandler.cpp + $(CXX) $(CXXFLAGS) ../../Archive/Udf/UdfHandler.cpp +@@ -535,10 +523,6 @@ + $(CXX) $(CXXFLAGS) ../../Crypto/7zAesRegister.cpp + WzAes.o : ../../Crypto/WzAes.cpp + $(CXX) $(CXXFLAGS) ../../Crypto/WzAes.cpp +-Rar20Crypto.o : ../../Crypto/Rar20Crypto.cpp +- $(CXX) $(CXXFLAGS) ../../Crypto/Rar20Crypto.cpp +-RarAes.o : ../../Crypto/RarAes.cpp +- $(CXX) $(CXXFLAGS) ../../Crypto/RarAes.cpp + HmacSha1.o : ../../Crypto/HmacSha1.cpp + $(CXX) $(CXXFLAGS) ../../Crypto/HmacSha1.cpp + Pbkdf2HmacSha1.o : ../../Crypto/Pbkdf2HmacSha1.cpp -- cgit v1.2.3 From 828815c700f7c6e73794fa2aeca4e4e1c0f1d2fc Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 4 Sep 2014 23:18:43 -0300 Subject: ogre: remove libre suffix and add complex pkgrel --- libre/ogre-libre/PKGBUILD | 172 -------- libre/ogre-libre/libre.patch | 966 ------------------------------------------- libre/ogre/PKGBUILD | 171 ++++++++ libre/ogre/libre.patch | 966 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1137 insertions(+), 1138 deletions(-) delete mode 100644 libre/ogre-libre/PKGBUILD delete mode 100644 libre/ogre-libre/libre.patch create mode 100644 libre/ogre/PKGBUILD create mode 100644 libre/ogre/libre.patch (limited to 'libre') diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD deleted file mode 100644 index 890b46163..000000000 --- a/libre/ogre-libre/PKGBUILD +++ /dev/null @@ -1,172 +0,0 @@ -# Maintainer: Márcio Silva - -_bldname=blender -_bldver=2.69 -_bldep=10 - -# ($srcdir/Tools/${_bldname^}2.6Export/__init__.py:bl_info>version) -_addver=2.0.3 -_addrel=1 - -pkgbase=ogre -pkgname=( - $pkgbase-libre - #$_bldname-addon-$pkgbase # package unstable -) -pkgver=1.9.0 -pkgrel=6 -pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files' -arch=( - mips64el - x86_64 - i686 -) -url=http://www.${pkgbase}3d.org -license=MIT -depends=( - boost-libs - freeimage - freetype2 - glu - libxaw - libxrandr - ois - tinyxml - zziplib -) -makedepends=( - boost - cmake - doxygen - graphviz - mesa - mercurial - ttf-dejavu -) -mksource=( - ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-} -) -source=( - https://repo.parabolagnulinux.org/other/$pkgbase-libre/$pkgbase-libre-$pkgver.tar.xz - libre.patch -) -mksha512sums=( - SKIP -) -sha512sums=( - 13e743d65affd6813f6e3c6064d543bfe2d013a8d44bec203dc819859618114f0e5c7f5e67a98250d0174497dd58a9238956e04ac9f7925695ab6ebda555c412 - 5480c08c6faf48c1aabde1efd9508165c2fbea78f19d58c6360ea310c223d1979a7d7eaa15c9a70c8c3b3e7f89877c6f47e7fe16638ae77c463d55e87a5a3316 -) - -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 -} - -prepare() { - cd ${pkgbase} - - # remove nonfree references - patch -Np1 -i $srcdir/libre.patch - - # 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 -} - -build() { - cd ${pkgbase} - - # get a clean build dir - [[ -d build ]] && rm -vrf build - mkdir -v build && cd build - - # SAMPLES, SAMPLES_SOURCE and TESTS are nonfree - cmake .. \ - -DCMAKE_BUILD_TYPE=Release\ - -DCMAKE_INSTALL_PREFIX=/usr\ - -DCPACK_PACKAGE_DESCRIPTION_SUMMARY='Libre 3D Graphics Engine'\ - -D${pkgbase^^}_BUILD_COMPONENT_PAGING=TRUE\ - -D${pkgbase^^}_BUILD_COMPONENT_PROPERTY=TRUE\ - -D${pkgbase^^}_BUILD_COMPONENT_RTSHADERSYSTEM=TRUE\ - -D${pkgbase^^}_BUILD_COMPONENT_TERRAIN=TRUE\ - -D${pkgbase^^}_BUILD_PLATFORM_NACL=FALSE\ - -D${pkgbase^^}_BUILD_PLUGIN_BSP=TRUE\ - -D${pkgbase^^}_BUILD_PLUGIN_OCTREE=TRUE\ - -D${pkgbase^^}_BUILD_PLUGIN_PCZ=TRUE\ - -D${pkgbase^^}_BUILD_PLUGIN_PFX=TRUE\ - -D${pkgbase^^}_BUILD_RENDERSYSTEM_GL=TRUE\ - -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES=FALSE\ - -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES2=FALSE\ - -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_CORE_SHADERS=TRUE\ - -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_EXT_SHADERS=TRUE\ - -D${pkgbase^^}_BUILD_SAMPLES=FALSE\ - -D${pkgbase^^}_BUILD_TESTS=FALSE\ - -D${pkgbase^^}_BUILD_TOOLS=TRUE\ - -D${pkgbase^^}_CONFIG_ENABLE_DDS=TRUE\ - -D${pkgbase^^}_CONFIG_ENABLE_FREEIMAGE=TRUE\ - -D${pkgbase^^}_CONFIG_ENABLE_GLES2_GLSL_OPTIMISER=TRUE\ - -D${pkgbase^^}_CONFIG_ENABLE_PVRTC=TRUE\ - -D${pkgbase^^}_CONFIG_ENABLE_VIEWPORT_ORIENTATIONMODE=TRUE\ - -D${pkgbase^^}_CONFIG_ENABLE_ZIP=TRUE\ - -D${pkgbase^^}_CONFIG_NEW_COMPILERS=TRUE\ - -D${pkgbase^^}_CONFIG_THREAD_PROVIDER=boost\ - -D${pkgbase^^}_INSTALL_DOCS=FALSE\ - -D${pkgbase^^}_INSTALL_SAMPLES=FALSE\ - -D${pkgbase^^}_INSTALL_SAMPLES_SOURCE=FALSE\ - -D${pkgbase^^}_INSTALL_TOOLS=TRUE\ - -D${pkgbase^^}_LIB_DIRECTORY=lib\ - -D${pkgbase^^}_PROFILING=TRUE\ - -D${pkgbase^^}_USE_BOOST=TRUE -# make V=0 - make -} - -package_ogre-libre() { - optdepends=( - "boost: for developing using $pkgbase" - "$pkgbase-docs: documentation" - ) - provides=($pkgbase=$pkgver) - conflicts=$pkgbase - replaces=$pkgbase - - cd ${pkgbase}/build - - make DESTDIR=$pkgdir install - - # install license - install -vDm644 ../Docs/License.html $pkgdir/usr/share/licenses/$pkgbase/license.html - - # remove files only useful for nonfree software - rm -vr $pkgdir/usr/lib/OGRE/cmake - rm -v $pkgdir/usr/include/OGRE/Example*.h -} - -package_blender-addon-ogre() { - pkgdesc="${pkgbase^} Mesh Exporter: A addon for the ${_bldname^} which allows export mesh and (skeletal/morph/pose) animations to ${pkgbase^}3D format (built for the $_bldname-libre package)" - arch=any - depends=( - "$_bldname-libre>=$(($_bldep-1)):$_bldver" - "$_bldname-libre<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" - ) - _pkgver=$pkgver - pkgver=$_addver.v$_bldver - pkgrel=$_addrel - - cd ${pkgbase} - a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons - install -vd $a && cp -va Tools/${_bldname^}2.6Export $a/$pkgbase -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/ogre-libre/libre.patch b/libre/ogre-libre/libre.patch deleted file mode 100644 index e9a1846b1..000000000 --- a/libre/ogre-libre/libre.patch +++ /dev/null @@ -1,966 +0,0 @@ -diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cmake ---- ogre.orig/CMake/InstallResources.cmake 2014-03-31 16:44:40.544894640 -0300 -+++ ogre/CMake/InstallResources.cmake 2014-03-31 16:59:12.012359302 -0300 -@@ -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) -@@ -133,7 +130,6 @@ - ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg - ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg - ${OGRE_BINARY_DIR}/inst/bin/debug/tests_d.cfg -- ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg - DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_DEBUG_PATH}" CONFIGURATIONS Debug - ) - install(FILES -@@ -141,7 +137,6 @@ - ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg - ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg - ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg -- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg - DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None "" - ) - install(FILES -@@ -149,7 +144,6 @@ - ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg - ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg - ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg -- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg - DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo - ) - install(FILES -@@ -157,7 +151,6 @@ - ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg - ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg - ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg -- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg - DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel - ) - -@@ -168,7 +161,6 @@ - ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg - ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg - ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg -- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg - DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}" - ) - endif() -@@ -219,11 +211,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) -@@ -243,8 +230,6 @@ - configure_file(${OGRE_TEMPLATES_DIR}/resources${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/resources${OGRE_CFG_SUFFIX}.cfg) - # create plugins.cfg - configure_file(${OGRE_TEMPLATES_DIR}/plugins${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/plugins${OGRE_CFG_SUFFIX}.cfg) -- # create quakemap.cfg -- configure_file(${OGRE_TEMPLATES_DIR}/quakemap${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/quakemap${OGRE_CFG_SUFFIX}.cfg) - # create samples.cfg - configure_file(${OGRE_TEMPLATES_DIR}/samples${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/samples${OGRE_CFG_SUFFIX}.cfg) - # create tests.cfg -diff -Nur ogre.orig/CMake/Templates/Android_resources.cfg.in ogre/CMake/Templates/Android_resources.cfg.in ---- ogre.orig/CMake/Templates/Android_resources.cfg.in 2014-03-31 16:44:40.591560636 -0300 -+++ ogre/CMake/Templates/Android_resources.cfg.in 2014-03-31 17:02:01.633252779 -0300 -@@ -12,7 +12,6 @@ - APKFileSystem=/materials/programs/GLSLES - APKFileSystem=/materials/scripts - APKFileSystem=/materials/textures --APKFileSystem=/materials/textures/nvidia - APKFileSystem=/models - APKFileSystem=/particle - APKFileSystem=/RTShaderLib -diff -Nur ogre.orig/CMake/Templates/SDK_CMakeLists.txt.in ogre/CMake/Templates/SDK_CMakeLists.txt.in ---- ogre.orig/CMake/Templates/SDK_CMakeLists.txt.in 2014-03-31 16:44:40.618226919 -0300 -+++ ogre/CMake/Templates/SDK_CMakeLists.txt.in 2014-03-31 16:59:35.715351689 -0300 -@@ -245,7 +245,6 @@ - configure_file(${OGRE_SOURCE_DIR}/plugins.cfg ${OGRE_BINARY_DIR}/bin/plugins.cfg COPYONLY) - configure_file(${OGRE_SOURCE_DIR}/resources.cfg ${OGRE_BINARY_DIR}/bin/resources.cfg COPYONLY) - configure_file(${OGRE_SOURCE_DIR}/samples.cfg ${OGRE_BINARY_DIR}/bin/samples.cfg COPYONLY) -- configure_file(${OGRE_SOURCE_DIR}/quakemap.cfg ${OGRE_BINARY_DIR}/bin/quakemap.cfg COPYONLY) - endif () - - if (MINGW) -diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demomedia.wxi.in ---- ogre.orig/CMake/Templates/demomedia.wxi.in 2014-03-31 16:44:40.628226774 -0300 -+++ ogre/CMake/Templates/demomedia.wxi.in 2014-03-31 16:51:57.408610715 -0300 -@@ -295,13 +295,6 @@ - - - -- -- -- -- -- -- -- - - - -@@ -328,8 +321,6 @@ - - - -- -- - - - -@@ -1338,29 +1329,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -1444,12 +1412,6 @@ - - - -- -- -- -- -- -- - - - -@@ -1794,4 +1756,4 @@ - - - -- -\ No newline at end of file -+ -diff -Nur ogre.orig/CMake/Templates/demos.wxs.in ogre/CMake/Templates/demos.wxs.in ---- ogre.orig/CMake/Templates/demos.wxs.in 2014-03-31 16:44:40.631560060 -0300 -+++ ogre/CMake/Templates/demos.wxs.in 2014-03-31 16:59:50.921799622 -0300 -@@ -39,7 +39,6 @@ - - - -- - - - -diff -Nur ogre.orig/CMake/Templates/resources.cfg.in ogre/CMake/Templates/resources.cfg.in ---- ogre.orig/CMake/Templates/resources.cfg.in 2014-03-31 16:44:40.641559915 -0300 -+++ ogre/CMake/Templates/resources.cfg.in 2014-03-31 17:02:35.802761281 -0300 -@@ -12,7 +12,6 @@ - FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs - FileSystem=@OGRE_MEDIA_DIR_REL@/materials/scripts - FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures --FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures/nvidia - FileSystem=@OGRE_MEDIA_DIR_REL@/models - FileSystem=@OGRE_MEDIA_DIR_REL@/particle - FileSystem=@OGRE_MEDIA_DIR_REL@/DeferredShadingMedia -diff -Nur ogre.orig/CMake/Templates/resources_d.cfg.in ogre/CMake/Templates/resources_d.cfg.in ---- ogre.orig/CMake/Templates/resources_d.cfg.in 2014-03-31 16:44:40.644893200 -0300 -+++ ogre/CMake/Templates/resources_d.cfg.in 2014-03-31 17:02:14.183072260 -0300 -@@ -12,7 +12,6 @@ - FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/programs - FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/scripts - FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/textures --FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/textures/nvidia - FileSystem=@OGRE_MEDIA_DIR_DBG@/models - FileSystem=@OGRE_MEDIA_DIR_DBG@/particle - FileSystem=@OGRE_MEDIA_DIR_DBG@/DeferredShadingMedia -diff -Nur ogre.orig/Samples/BSP/include/BSP.h ogre/Samples/BSP/include/BSP.h ---- ogre.orig/Samples/BSP/include/BSP.h 2014-03-31 16:44:40.718225480 -0300 -+++ ogre/Samples/BSP/include/BSP.h 2014-03-31 16:58:16.993150707 -0300 -@@ -19,7 +19,6 @@ - { - mInfo["Title"] = "BSP"; - mInfo["Description"] = "A demo of the indoor, or BSP (Binary Space Partition) scene manager. " -- "Also demonstrates how to load BSP maps from Quake 3."; - mInfo["Thumbnail"] = "thumb_bsp.png"; - mInfo["Category"] = "Geometry"; - } -@@ -43,27 +42,6 @@ - - protected: - -- void locateResources() -- { -- // load the Quake archive location and map name from a config file -- ConfigFile cf; -- cf.load(mFSLayer->getConfigFilePath("quakemap.cfg")); -- mArchive = cf.getSetting("Archive"); -- mMap = cf.getSetting("Map"); -- --#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS -- // OS X does not set the working directory relative to the app, -- // In order to make things portable on OS X we need to provide -- // the loading with it's own bundle path location -- if (!Ogre::StringUtil::startsWith(mArchive, "/", false)) // only adjust relative dirs -- mArchive = Ogre::String(Ogre::macBundlePath() + "/" + mArchive); --#endif -- -- // add the Quake archive to the world resource group -- ResourceGroupManager::getSingleton().addResourceLocation(mArchive, "Zip", -- ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true); -- } -- - void createSceneManager() - { - mSceneMgr = mRoot->createSceneManager("BspSceneManager"); // the BSP scene manager is required for this sample -@@ -108,10 +86,6 @@ - // set a random player starting point - ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true); - -- // Quake uses the Z axis as the up axis, so make necessary adjustments -- mCamera->setFixedYawAxis(true, Vector3::UNIT_Z); -- mCamera->pitch(Degree(90)); -- - mCamera->setPosition(vp.position); - mCamera->rotate(vp.orientation); - -diff -Nur ogre.orig/Samples/Browser/CMakeLists.txt ogre/Samples/Browser/CMakeLists.txt ---- ogre.orig/Samples/Browser/CMakeLists.txt 2014-03-31 16:44:40.734891905 -0300 -+++ ogre/Samples/Browser/CMakeLists.txt 2014-03-31 16:54:51.716103447 -0300 -@@ -307,8 +307,6 @@ - ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ - COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/samples.cfg - ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ -- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/quakemap.cfg -- ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ - COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Media - ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ - COMMAND ditto -@@ -323,8 +321,6 @@ - ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ - COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg - ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ -- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg -- ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ - COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media - ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ - COMMAND ditto -diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-03-31 16:44:40.791557758 -0300 -+++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-03-31 16:51:57.408610715 -0300 -@@ -555,48 +555,6 @@ - false - false - -- -- false -- false -- true -- false -- false -- -- -- false -- false -- true -- false -- false -- -- -- false -- false -- true -- false -- false -- -- -- false -- false -- true -- false -- false -- -- -- false -- false -- true -- false -- false -- -- -- false -- false -- true -- false -- false -- - - false - false -@@ -3671,15 +3629,6 @@ - false - false - -- -- false -- true -- false -- true -- true -- false -- false -- - - false - true -@@ -4867,20 +4816,6 @@ - false - false - -- -- false -- false -- true -- false -- false -- -- -- false -- false -- true -- false -- false -- - - false - false -@@ -4893,4 +4828,4 @@ - - - -- -\ No newline at end of file -+ -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-03-31 16:44:40.808224186 -0300 -+++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-03-31 16:51:57.411944001 -0300 -@@ -628,9 +628,6 @@ - - Assets\media - -- -- Assets\media -- - - Assets\media - -@@ -1075,9 +1072,6 @@ - - Assets\media - -- -- Assets\media -- - - Assets\media - -@@ -1105,12 +1099,6 @@ - - Assets\media - -- -- Assets\media -- -- -- Assets\media -- - - Assets\media - -@@ -1168,24 +1156,12 @@ - - Assets\media - -- -- Assets\media -- -- -- Assets\media -- - - Assets\media - - - Assets\media - -- -- Assets\media -- -- -- Assets\media -- - - Assets\media - -@@ -1492,9 +1468,6 @@ - - Assets\media - -- -- Assets\media -- - - Assets\media - -@@ -1658,4 +1631,4 @@ - Assets\media - - -- -\ No newline at end of file -+ -diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-03-31 16:44:40.821557325 -0300 -+++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-03-31 16:51:57.415277288 -0300 -@@ -4356,21 +4356,6 @@ - false - false - -- -- true -- false -- false -- false -- false -- false -- false -- false -- false -- false -- false -- false -- false -- - - true - false -@@ -6443,96 +6428,6 @@ - false - false - -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- - - false - false -@@ -9014,36 +8909,6 @@ - false - false - -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- - - false - false -@@ -9264,4 +9129,4 @@ - - - -- -\ No newline at end of file -+ -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-03-31 16:44:40.918222604 -0300 -+++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-03-31 16:51:57.415277288 -0300 -@@ -731,9 +731,6 @@ - - Assets\media - -- -- Assets\media -- - - Assets\media - -@@ -1154,9 +1151,6 @@ - - Assets\media - -- -- Assets\media -- - - Assets\media - -@@ -1184,12 +1178,6 @@ - - Assets\media - -- -- Assets\media -- -- -- Assets\media -- - - Assets\media - -@@ -1247,24 +1235,12 @@ - - Assets\media - -- -- Assets\media -- -- -- Assets\media -- - - Assets\media - - - Assets\media - -- -- Assets\media -- -- -- Assets\media -- - - Assets\media - -@@ -1571,9 +1547,6 @@ - - Assets\media - -- -- Assets\media -- - - Assets\media - -@@ -1775,4 +1748,4 @@ - Assets\for WMAppManifest - - -- -\ No newline at end of file -+ -diff -Nur ogre.orig/Samples/Browser/WinRT.Xaml/resources.cfg ogre/Samples/Browser/WinRT.Xaml/resources.cfg ---- ogre.orig/Samples/Browser/WinRT.Xaml/resources.cfg 2014-03-31 16:44:40.771558046 -0300 -+++ ogre/Samples/Browser/WinRT.Xaml/resources.cfg 2014-03-31 17:00:55.510870562 -0300 -@@ -11,7 +11,6 @@ - FileSystem=media/materials/programs - FileSystem=media/materials/scripts - FileSystem=media/materials/textures --FileSystem=media/materials/textures/nvidia - FileSystem=media/models - FileSystem=media/particle - FileSystem=media/DeferredShadingMedia -diff -Nur ogre.orig/Samples/Browser/WinRT.Xaml/resources_d.cfg ogre/Samples/Browser/WinRT.Xaml/resources_d.cfg ---- ogre.orig/Samples/Browser/WinRT.Xaml/resources_d.cfg 2014-03-31 16:44:40.771558046 -0300 -+++ ogre/Samples/Browser/WinRT.Xaml/resources_d.cfg 2014-03-31 17:01:16.207239528 -0300 -@@ -11,7 +11,6 @@ - FileSystem=media/materials/programs - FileSystem=media/materials/scripts - FileSystem=media/materials/textures --FileSystem=media/materials/textures/nvidia - FileSystem=media/models - FileSystem=media/particle - FileSystem=media/DeferredShadingMedia -diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt ---- ogre.orig/Samples/CMakeLists.txt 2014-03-31 16:44:40.941555601 -0300 -+++ ogre/Samples/CMakeLists.txt 2014-03-31 16:51:57.415277288 -0300 -@@ -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-03-31 16:44:41.174885577 -0300 -+++ ogre/Samples/EndlessWorld/include/EndlessWorld.h 2014-03-31 16:51:57.415277288 -0300 -@@ -307,17 +307,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-03-31 16:44:41.678211671 -0300 -+++ ogre/Samples/Media/volumeTerrain/triplanarReference.material 2014-03-31 16:51:57.415277288 -0300 -@@ -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-03-31 16:44:42.381534889 -0300 -+++ ogre/Samples/Terrain/include/Terrain.h 2014-03-31 16:51:57.415277288 -0300 -@@ -534,17 +534,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/CMakeLists.txt ogre/Tests/CMakeLists.txt ---- ogre.orig/Tests/CMakeLists.txt 2014-03-31 16:44:42.431534168 -0300 -+++ ogre/Tests/CMakeLists.txt 2014-03-31 16:55:11.432486511 -0300 -@@ -78,8 +78,6 @@ - ${OGRE_TEST_CONTENTS_PATH}/Resources/ - COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg - ${OGRE_TEST_CONTENTS_PATH}/Resources/ -- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg -- ${OGRE_TEST_CONTENTS_PATH}/Resources/ - COMMAND ditto - ${OGRE_SOURCE_DIR}/Samples/Media/ ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/ - COMMAND ditto -diff -Nur ogre.orig/Tests/PlayPen/src/PlayPen.cpp ogre/Tests/PlayPen/src/PlayPen.cpp ---- ogre.orig/Tests/PlayPen/src/PlayPen.cpp 2014-03-31 16:44:42.661530860 -0300 -+++ ogre/Tests/PlayPen/src/PlayPen.cpp 2014-03-31 16:51:57.418610574 -0300 -@@ -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 -Nur ogre.orig/Tests/VisualTests/Context/CMakeLists.txt ogre/Tests/VisualTests/Context/CMakeLists.txt ---- ogre.orig/Tests/VisualTests/Context/CMakeLists.txt 2014-03-31 16:44:42.681530572 -0300 -+++ ogre/Tests/VisualTests/Context/CMakeLists.txt 2014-03-31 16:55:35.265477026 -0300 -@@ -137,8 +137,6 @@ - ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ - COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/resources.cfg - ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ -- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg -- ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ - COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/tests.cfg - ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ - COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media -diff -Nur ogre.orig/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp ogre/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp ---- ogre.orig/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp 2014-03-31 16:44:42.711530141 -0300 -+++ ogre/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp 2014-03-31 16:56:35.361279265 -0300 -@@ -2018,47 +2018,6 @@ - addScreenshotFrame(10); - } - //---------------------------------------------------------------------------- -- --void PlayPen_Bsp::setupContent() --{ -- // Load Quake3 locations from a file -- ConfigFile cf; -- -- cf.load(mFSLayer->getConfigFilePath("quakemap.cfg")); -- -- String quakePk3 = cf.getSetting("Archive"); -- String quakeLevel = cf.getSetting("Map"); -- -- //ResourceGroupManager::getSingleton().addResourceLocation(quakePk3, "Zip"); -- -- ResourceGroupManager::getSingleton().addResourceLocation( -- quakePk3, "Zip", -- ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true); -- -- // Load world geometry -- //mSceneMgr->setWorldGeometry(quakeLevel); -- -- ResourceGroupManager& rgm = ResourceGroupManager::getSingleton(); -- rgm.linkWorldGeometryToResourceGroup(rgm.getWorldResourceGroupName(), quakeLevel, mSceneMgr); -- rgm.initialiseResourceGroup(rgm.getWorldResourceGroupName()); -- rgm.loadResourceGroup(rgm.getWorldResourceGroupName(), false); -- -- // modify camera for close work -- mCamera->setNearClipDistance(4); -- mCamera->setFarClipDistance(4000); -- -- // Also change position, and set Quake-type orientation -- // Get random player start point -- ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true); -- mCamera->setPosition(vp.position); -- mCamera->pitch(Degree(90)); // Quake uses X/Y horizon, Z up -- mCamera->rotate(vp.orientation); -- // Don't yaw along variable axis, causes leaning -- mCamera->setFixedYawAxis(true, Vector3::UNIT_Z); -- -- mCamera->yaw(Ogre::Degree(-90.f)); --} --//---------------------------------------------------------------------------- - //---------------------------------------------------------------------------- - - PlayPen_BuildTangentOnAnimatedMesh::PlayPen_BuildTangentOnAnimatedMesh() diff --git a/libre/ogre/PKGBUILD b/libre/ogre/PKGBUILD new file mode 100644 index 000000000..99804ea63 --- /dev/null +++ b/libre/ogre/PKGBUILD @@ -0,0 +1,171 @@ +# Maintainer: Márcio Silva + +_bldname=blender +_bldver=2.69 +_bldep=10 + +# ($srcdir/Tools/${_bldname^}2.6Export/__init__.py:bl_info>version) +_addver=2.0.3 +_addrel=1 + +pkgbase=ogre +pkgname=( + $pkgbase + #$_bldname-addon-$pkgbase # package unstable +) +pkgver=1.9.0 +pkgrel=6.parabola1 +pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files' +arch=( + mips64el + x86_64 + i686 +) +url=http://www.${pkgbase}3d.org +license=MIT +depends=( + boost-libs + freeimage + freetype2 + glu + libxaw + libxrandr + ois + tinyxml + zziplib +) +makedepends=( + boost + cmake + doxygen + graphviz + mesa + mercurial + ttf-dejavu +) +mksource=( + ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-} +) +source=( + https://repo.parabolagnulinux.org/other/$pkgbase-libre/$pkgbase-libre-$pkgver.tar.xz + libre.patch +) +mksha512sums=( + SKIP +) +sha512sums=( + 13e743d65affd6813f6e3c6064d543bfe2d013a8d44bec203dc819859618114f0e5c7f5e67a98250d0174497dd58a9238956e04ac9f7925695ab6ebda555c412 + 5480c08c6faf48c1aabde1efd9508165c2fbea78f19d58c6360ea310c223d1979a7d7eaa15c9a70c8c3b3e7f89877c6f47e7fe16638ae77c463d55e87a5a3316 +) + +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 +} + +prepare() { + cd ${pkgbase} + + # remove nonfree references + patch -Np1 -i $srcdir/libre.patch + + # 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 +} + +build() { + cd ${pkgbase} + + # get a clean build dir + [[ -d build ]] && rm -vrf build + mkdir -v build && cd build + + # SAMPLES, SAMPLES_SOURCE and TESTS are nonfree + cmake .. \ + -DCMAKE_BUILD_TYPE=Release\ + -DCMAKE_INSTALL_PREFIX=/usr\ + -DCPACK_PACKAGE_DESCRIPTION_SUMMARY='Libre 3D Graphics Engine'\ + -D${pkgbase^^}_BUILD_COMPONENT_PAGING=TRUE\ + -D${pkgbase^^}_BUILD_COMPONENT_PROPERTY=TRUE\ + -D${pkgbase^^}_BUILD_COMPONENT_RTSHADERSYSTEM=TRUE\ + -D${pkgbase^^}_BUILD_COMPONENT_TERRAIN=TRUE\ + -D${pkgbase^^}_BUILD_PLATFORM_NACL=FALSE\ + -D${pkgbase^^}_BUILD_PLUGIN_BSP=TRUE\ + -D${pkgbase^^}_BUILD_PLUGIN_OCTREE=TRUE\ + -D${pkgbase^^}_BUILD_PLUGIN_PCZ=TRUE\ + -D${pkgbase^^}_BUILD_PLUGIN_PFX=TRUE\ + -D${pkgbase^^}_BUILD_RENDERSYSTEM_GL=TRUE\ + -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES=FALSE\ + -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES2=FALSE\ + -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_CORE_SHADERS=TRUE\ + -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_EXT_SHADERS=TRUE\ + -D${pkgbase^^}_BUILD_SAMPLES=FALSE\ + -D${pkgbase^^}_BUILD_TESTS=FALSE\ + -D${pkgbase^^}_BUILD_TOOLS=TRUE\ + -D${pkgbase^^}_CONFIG_ENABLE_DDS=TRUE\ + -D${pkgbase^^}_CONFIG_ENABLE_FREEIMAGE=TRUE\ + -D${pkgbase^^}_CONFIG_ENABLE_GLES2_GLSL_OPTIMISER=TRUE\ + -D${pkgbase^^}_CONFIG_ENABLE_PVRTC=TRUE\ + -D${pkgbase^^}_CONFIG_ENABLE_VIEWPORT_ORIENTATIONMODE=TRUE\ + -D${pkgbase^^}_CONFIG_ENABLE_ZIP=TRUE\ + -D${pkgbase^^}_CONFIG_NEW_COMPILERS=TRUE\ + -D${pkgbase^^}_CONFIG_THREAD_PROVIDER=boost\ + -D${pkgbase^^}_INSTALL_DOCS=FALSE\ + -D${pkgbase^^}_INSTALL_SAMPLES=FALSE\ + -D${pkgbase^^}_INSTALL_SAMPLES_SOURCE=FALSE\ + -D${pkgbase^^}_INSTALL_TOOLS=TRUE\ + -D${pkgbase^^}_LIB_DIRECTORY=lib\ + -D${pkgbase^^}_PROFILING=TRUE\ + -D${pkgbase^^}_USE_BOOST=TRUE +# make V=0 + make +} + +package_ogre() { + optdepends=( + "boost: for developing using $pkgbase" + "$pkgbase-docs: documentation" + ) + conflicts=(${pkgbase}-libre) + replaces=(${pkgbase}-libre) + + cd ${pkgbase}/build + + make DESTDIR=$pkgdir install + + # install license + install -vDm644 ../Docs/License.html $pkgdir/usr/share/licenses/$pkgbase/license.html + + # remove files only useful for nonfree software + rm -vr $pkgdir/usr/lib/OGRE/cmake + rm -v $pkgdir/usr/include/OGRE/Example*.h +} + +package_blender-addon-ogre() { + pkgdesc="${pkgbase^} Mesh Exporter: A addon for the ${_bldname^} which allows export mesh and (skeletal/morph/pose) animations to ${pkgbase^}3D format (built for the $_bldname package)" + arch=any + depends=( + "$_bldname>=$(($_bldep-1)):$_bldver" + "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + ) + _pkgver=$pkgver + pkgver=$_addver.v$_bldver + pkgrel=$_addrel + + cd ${pkgbase} + a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons + install -vd $a && cp -va Tools/${_bldname^}2.6Export $a/$pkgbase +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/ogre/libre.patch b/libre/ogre/libre.patch new file mode 100644 index 000000000..e9a1846b1 --- /dev/null +++ b/libre/ogre/libre.patch @@ -0,0 +1,966 @@ +diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cmake +--- ogre.orig/CMake/InstallResources.cmake 2014-03-31 16:44:40.544894640 -0300 ++++ ogre/CMake/InstallResources.cmake 2014-03-31 16:59:12.012359302 -0300 +@@ -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) +@@ -133,7 +130,6 @@ + ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg + ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg + ${OGRE_BINARY_DIR}/inst/bin/debug/tests_d.cfg +- ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg + DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_DEBUG_PATH}" CONFIGURATIONS Debug + ) + install(FILES +@@ -141,7 +137,6 @@ + ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg +- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg + DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None "" + ) + install(FILES +@@ -149,7 +144,6 @@ + ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg +- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg + DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo + ) + install(FILES +@@ -157,7 +151,6 @@ + ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg +- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg + DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel + ) + +@@ -168,7 +161,6 @@ + ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg + ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg +- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg + DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}" + ) + endif() +@@ -219,11 +211,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) +@@ -243,8 +230,6 @@ + configure_file(${OGRE_TEMPLATES_DIR}/resources${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/resources${OGRE_CFG_SUFFIX}.cfg) + # create plugins.cfg + configure_file(${OGRE_TEMPLATES_DIR}/plugins${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/plugins${OGRE_CFG_SUFFIX}.cfg) +- # create quakemap.cfg +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/quakemap${OGRE_CFG_SUFFIX}.cfg) + # create samples.cfg + configure_file(${OGRE_TEMPLATES_DIR}/samples${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/samples${OGRE_CFG_SUFFIX}.cfg) + # create tests.cfg +diff -Nur ogre.orig/CMake/Templates/Android_resources.cfg.in ogre/CMake/Templates/Android_resources.cfg.in +--- ogre.orig/CMake/Templates/Android_resources.cfg.in 2014-03-31 16:44:40.591560636 -0300 ++++ ogre/CMake/Templates/Android_resources.cfg.in 2014-03-31 17:02:01.633252779 -0300 +@@ -12,7 +12,6 @@ + APKFileSystem=/materials/programs/GLSLES + APKFileSystem=/materials/scripts + APKFileSystem=/materials/textures +-APKFileSystem=/materials/textures/nvidia + APKFileSystem=/models + APKFileSystem=/particle + APKFileSystem=/RTShaderLib +diff -Nur ogre.orig/CMake/Templates/SDK_CMakeLists.txt.in ogre/CMake/Templates/SDK_CMakeLists.txt.in +--- ogre.orig/CMake/Templates/SDK_CMakeLists.txt.in 2014-03-31 16:44:40.618226919 -0300 ++++ ogre/CMake/Templates/SDK_CMakeLists.txt.in 2014-03-31 16:59:35.715351689 -0300 +@@ -245,7 +245,6 @@ + configure_file(${OGRE_SOURCE_DIR}/plugins.cfg ${OGRE_BINARY_DIR}/bin/plugins.cfg COPYONLY) + configure_file(${OGRE_SOURCE_DIR}/resources.cfg ${OGRE_BINARY_DIR}/bin/resources.cfg COPYONLY) + configure_file(${OGRE_SOURCE_DIR}/samples.cfg ${OGRE_BINARY_DIR}/bin/samples.cfg COPYONLY) +- configure_file(${OGRE_SOURCE_DIR}/quakemap.cfg ${OGRE_BINARY_DIR}/bin/quakemap.cfg COPYONLY) + endif () + + if (MINGW) +diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demomedia.wxi.in +--- ogre.orig/CMake/Templates/demomedia.wxi.in 2014-03-31 16:44:40.628226774 -0300 ++++ ogre/CMake/Templates/demomedia.wxi.in 2014-03-31 16:51:57.408610715 -0300 +@@ -295,13 +295,6 @@ + + + +- +- +- +- +- +- +- + + + +@@ -328,8 +321,6 @@ + + + +- +- + + + +@@ -1338,29 +1329,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -1444,12 +1412,6 @@ + + + +- +- +- +- +- +- + + + +@@ -1794,4 +1756,4 @@ + + + +- +\ No newline at end of file ++ +diff -Nur ogre.orig/CMake/Templates/demos.wxs.in ogre/CMake/Templates/demos.wxs.in +--- ogre.orig/CMake/Templates/demos.wxs.in 2014-03-31 16:44:40.631560060 -0300 ++++ ogre/CMake/Templates/demos.wxs.in 2014-03-31 16:59:50.921799622 -0300 +@@ -39,7 +39,6 @@ + + + +- + + + +diff -Nur ogre.orig/CMake/Templates/resources.cfg.in ogre/CMake/Templates/resources.cfg.in +--- ogre.orig/CMake/Templates/resources.cfg.in 2014-03-31 16:44:40.641559915 -0300 ++++ ogre/CMake/Templates/resources.cfg.in 2014-03-31 17:02:35.802761281 -0300 +@@ -12,7 +12,6 @@ + FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs + FileSystem=@OGRE_MEDIA_DIR_REL@/materials/scripts + FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures +-FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures/nvidia + FileSystem=@OGRE_MEDIA_DIR_REL@/models + FileSystem=@OGRE_MEDIA_DIR_REL@/particle + FileSystem=@OGRE_MEDIA_DIR_REL@/DeferredShadingMedia +diff -Nur ogre.orig/CMake/Templates/resources_d.cfg.in ogre/CMake/Templates/resources_d.cfg.in +--- ogre.orig/CMake/Templates/resources_d.cfg.in 2014-03-31 16:44:40.644893200 -0300 ++++ ogre/CMake/Templates/resources_d.cfg.in 2014-03-31 17:02:14.183072260 -0300 +@@ -12,7 +12,6 @@ + FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/programs + FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/scripts + FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/textures +-FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/textures/nvidia + FileSystem=@OGRE_MEDIA_DIR_DBG@/models + FileSystem=@OGRE_MEDIA_DIR_DBG@/particle + FileSystem=@OGRE_MEDIA_DIR_DBG@/DeferredShadingMedia +diff -Nur ogre.orig/Samples/BSP/include/BSP.h ogre/Samples/BSP/include/BSP.h +--- ogre.orig/Samples/BSP/include/BSP.h 2014-03-31 16:44:40.718225480 -0300 ++++ ogre/Samples/BSP/include/BSP.h 2014-03-31 16:58:16.993150707 -0300 +@@ -19,7 +19,6 @@ + { + mInfo["Title"] = "BSP"; + mInfo["Description"] = "A demo of the indoor, or BSP (Binary Space Partition) scene manager. " +- "Also demonstrates how to load BSP maps from Quake 3."; + mInfo["Thumbnail"] = "thumb_bsp.png"; + mInfo["Category"] = "Geometry"; + } +@@ -43,27 +42,6 @@ + + protected: + +- void locateResources() +- { +- // load the Quake archive location and map name from a config file +- ConfigFile cf; +- cf.load(mFSLayer->getConfigFilePath("quakemap.cfg")); +- mArchive = cf.getSetting("Archive"); +- mMap = cf.getSetting("Map"); +- +-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS +- // OS X does not set the working directory relative to the app, +- // In order to make things portable on OS X we need to provide +- // the loading with it's own bundle path location +- if (!Ogre::StringUtil::startsWith(mArchive, "/", false)) // only adjust relative dirs +- mArchive = Ogre::String(Ogre::macBundlePath() + "/" + mArchive); +-#endif +- +- // add the Quake archive to the world resource group +- ResourceGroupManager::getSingleton().addResourceLocation(mArchive, "Zip", +- ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true); +- } +- + void createSceneManager() + { + mSceneMgr = mRoot->createSceneManager("BspSceneManager"); // the BSP scene manager is required for this sample +@@ -108,10 +86,6 @@ + // set a random player starting point + ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true); + +- // Quake uses the Z axis as the up axis, so make necessary adjustments +- mCamera->setFixedYawAxis(true, Vector3::UNIT_Z); +- mCamera->pitch(Degree(90)); +- + mCamera->setPosition(vp.position); + mCamera->rotate(vp.orientation); + +diff -Nur ogre.orig/Samples/Browser/CMakeLists.txt ogre/Samples/Browser/CMakeLists.txt +--- ogre.orig/Samples/Browser/CMakeLists.txt 2014-03-31 16:44:40.734891905 -0300 ++++ ogre/Samples/Browser/CMakeLists.txt 2014-03-31 16:54:51.716103447 -0300 +@@ -307,8 +307,6 @@ + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/samples.cfg + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ +- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/quakemap.cfg +- ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Media + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ditto +@@ -323,8 +321,6 @@ + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ +- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg +- ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media + ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ + COMMAND ditto +diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-03-31 16:44:40.791557758 -0300 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-03-31 16:51:57.408610715 -0300 +@@ -555,48 +555,6 @@ + false + false + +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- + + false + false +@@ -3671,15 +3629,6 @@ + false + false + +- +- false +- true +- false +- true +- true +- false +- false +- + + false + true +@@ -4867,20 +4816,6 @@ + false + false + +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- + + false + false +@@ -4893,4 +4828,4 @@ + + + +- +\ No newline at end of file ++ +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-03-31 16:44:40.808224186 -0300 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-03-31 16:51:57.411944001 -0300 +@@ -628,9 +628,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1075,9 +1072,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1105,12 +1099,6 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1168,24 +1156,12 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1492,9 +1468,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1658,4 +1631,4 @@ + Assets\media + + +- +\ No newline at end of file ++ +diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-03-31 16:44:40.821557325 -0300 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-03-31 16:51:57.415277288 -0300 +@@ -4356,21 +4356,6 @@ + false + false + +- +- true +- false +- false +- false +- false +- false +- false +- false +- false +- false +- false +- false +- false +- + + true + false +@@ -6443,96 +6428,6 @@ + false + false + +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- + + false + false +@@ -9014,36 +8909,6 @@ + false + false + +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- + + false + false +@@ -9264,4 +9129,4 @@ + + + +- +\ No newline at end of file ++ +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-03-31 16:44:40.918222604 -0300 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-03-31 16:51:57.415277288 -0300 +@@ -731,9 +731,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1154,9 +1151,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1184,12 +1178,6 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1247,24 +1235,12 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1571,9 +1547,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1775,4 +1748,4 @@ + Assets\for WMAppManifest + + +- +\ No newline at end of file ++ +diff -Nur ogre.orig/Samples/Browser/WinRT.Xaml/resources.cfg ogre/Samples/Browser/WinRT.Xaml/resources.cfg +--- ogre.orig/Samples/Browser/WinRT.Xaml/resources.cfg 2014-03-31 16:44:40.771558046 -0300 ++++ ogre/Samples/Browser/WinRT.Xaml/resources.cfg 2014-03-31 17:00:55.510870562 -0300 +@@ -11,7 +11,6 @@ + FileSystem=media/materials/programs + FileSystem=media/materials/scripts + FileSystem=media/materials/textures +-FileSystem=media/materials/textures/nvidia + FileSystem=media/models + FileSystem=media/particle + FileSystem=media/DeferredShadingMedia +diff -Nur ogre.orig/Samples/Browser/WinRT.Xaml/resources_d.cfg ogre/Samples/Browser/WinRT.Xaml/resources_d.cfg +--- ogre.orig/Samples/Browser/WinRT.Xaml/resources_d.cfg 2014-03-31 16:44:40.771558046 -0300 ++++ ogre/Samples/Browser/WinRT.Xaml/resources_d.cfg 2014-03-31 17:01:16.207239528 -0300 +@@ -11,7 +11,6 @@ + FileSystem=media/materials/programs + FileSystem=media/materials/scripts + FileSystem=media/materials/textures +-FileSystem=media/materials/textures/nvidia + FileSystem=media/models + FileSystem=media/particle + FileSystem=media/DeferredShadingMedia +diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt +--- ogre.orig/Samples/CMakeLists.txt 2014-03-31 16:44:40.941555601 -0300 ++++ ogre/Samples/CMakeLists.txt 2014-03-31 16:51:57.415277288 -0300 +@@ -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-03-31 16:44:41.174885577 -0300 ++++ ogre/Samples/EndlessWorld/include/EndlessWorld.h 2014-03-31 16:51:57.415277288 -0300 +@@ -307,17 +307,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-03-31 16:44:41.678211671 -0300 ++++ ogre/Samples/Media/volumeTerrain/triplanarReference.material 2014-03-31 16:51:57.415277288 -0300 +@@ -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-03-31 16:44:42.381534889 -0300 ++++ ogre/Samples/Terrain/include/Terrain.h 2014-03-31 16:51:57.415277288 -0300 +@@ -534,17 +534,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/CMakeLists.txt ogre/Tests/CMakeLists.txt +--- ogre.orig/Tests/CMakeLists.txt 2014-03-31 16:44:42.431534168 -0300 ++++ ogre/Tests/CMakeLists.txt 2014-03-31 16:55:11.432486511 -0300 +@@ -78,8 +78,6 @@ + ${OGRE_TEST_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg + ${OGRE_TEST_CONTENTS_PATH}/Resources/ +- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg +- ${OGRE_TEST_CONTENTS_PATH}/Resources/ + COMMAND ditto + ${OGRE_SOURCE_DIR}/Samples/Media/ ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/ + COMMAND ditto +diff -Nur ogre.orig/Tests/PlayPen/src/PlayPen.cpp ogre/Tests/PlayPen/src/PlayPen.cpp +--- ogre.orig/Tests/PlayPen/src/PlayPen.cpp 2014-03-31 16:44:42.661530860 -0300 ++++ ogre/Tests/PlayPen/src/PlayPen.cpp 2014-03-31 16:51:57.418610574 -0300 +@@ -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 -Nur ogre.orig/Tests/VisualTests/Context/CMakeLists.txt ogre/Tests/VisualTests/Context/CMakeLists.txt +--- ogre.orig/Tests/VisualTests/Context/CMakeLists.txt 2014-03-31 16:44:42.681530572 -0300 ++++ ogre/Tests/VisualTests/Context/CMakeLists.txt 2014-03-31 16:55:35.265477026 -0300 +@@ -137,8 +137,6 @@ + ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/resources.cfg + ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ +- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg +- ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/tests.cfg + ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ + COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media +diff -Nur ogre.orig/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp ogre/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp +--- ogre.orig/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp 2014-03-31 16:44:42.711530141 -0300 ++++ ogre/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp 2014-03-31 16:56:35.361279265 -0300 +@@ -2018,47 +2018,6 @@ + addScreenshotFrame(10); + } + //---------------------------------------------------------------------------- +- +-void PlayPen_Bsp::setupContent() +-{ +- // Load Quake3 locations from a file +- ConfigFile cf; +- +- cf.load(mFSLayer->getConfigFilePath("quakemap.cfg")); +- +- String quakePk3 = cf.getSetting("Archive"); +- String quakeLevel = cf.getSetting("Map"); +- +- //ResourceGroupManager::getSingleton().addResourceLocation(quakePk3, "Zip"); +- +- ResourceGroupManager::getSingleton().addResourceLocation( +- quakePk3, "Zip", +- ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true); +- +- // Load world geometry +- //mSceneMgr->setWorldGeometry(quakeLevel); +- +- ResourceGroupManager& rgm = ResourceGroupManager::getSingleton(); +- rgm.linkWorldGeometryToResourceGroup(rgm.getWorldResourceGroupName(), quakeLevel, mSceneMgr); +- rgm.initialiseResourceGroup(rgm.getWorldResourceGroupName()); +- rgm.loadResourceGroup(rgm.getWorldResourceGroupName(), false); +- +- // modify camera for close work +- mCamera->setNearClipDistance(4); +- mCamera->setFarClipDistance(4000); +- +- // Also change position, and set Quake-type orientation +- // Get random player start point +- ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true); +- mCamera->setPosition(vp.position); +- mCamera->pitch(Degree(90)); // Quake uses X/Y horizon, Z up +- mCamera->rotate(vp.orientation); +- // Don't yaw along variable axis, causes leaning +- mCamera->setFixedYawAxis(true, Vector3::UNIT_Z); +- +- mCamera->yaw(Ogre::Degree(-90.f)); +-} +-//---------------------------------------------------------------------------- + //---------------------------------------------------------------------------- + + PlayPen_BuildTangentOnAnimatedMesh::PlayPen_BuildTangentOnAnimatedMesh() -- cgit v1.2.3 From 4edfb3ebe56dc0fe99db55597a3d0aab0a3e7f72 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 4 Sep 2014 23:31:29 -0300 Subject: netsurf-3.2-1.parabola1: updating version, remove libre suffix and add complex pkgrel --- libre/netsurf-libre/PKGBUILD | 128 ------------------------------------ libre/netsurf-libre/netsurf.install | 13 ---- libre/netsurf-libre/netsurf.sh | 7 -- libre/netsurf/PKGBUILD | 123 ++++++++++++++++++++++++++++++++++ libre/netsurf/netsurf.install | 13 ++++ libre/netsurf/netsurf.sh | 7 ++ 6 files changed, 143 insertions(+), 148 deletions(-) delete mode 100644 libre/netsurf-libre/PKGBUILD delete mode 100644 libre/netsurf-libre/netsurf.install delete mode 100644 libre/netsurf-libre/netsurf.sh create mode 100644 libre/netsurf/PKGBUILD create mode 100644 libre/netsurf/netsurf.install create mode 100644 libre/netsurf/netsurf.sh (limited to 'libre') diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf-libre/PKGBUILD deleted file mode 100644 index 70ed26c7e..000000000 --- a/libre/netsurf-libre/PKGBUILD +++ /dev/null @@ -1,128 +0,0 @@ -# $Id: PKGBUILD 117980 2014-08-27 19:40:10Z arodseth $ -# Maintainer (Arch): Alexander Rødseth -# Contributor (Arch): Paulo Matias -# Contributor (Arch): Georgij Kondratjev -# Contributor (Arch): Daniel J Griffiths -# Maintainer: André Silva - -_pkgname=netsurf -pkgname=netsurf-libre -pkgver=3.1 -pkgrel=2 -pkgdesc='Lightweight and fast web browser, without non-privacy search providers' -arch=('x86_64' 'i686' 'mips64el') -url='http://www.netsurf-browser.org/' -license=('MIT' 'GPL2') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -depends=('libmng' 'librsvg' 'libwebp' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.3.0' 'libdom>=0.1.0' 'gtk2') # gtk3 -makedepends=('re2c' 'gendesk' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind' 'inetutils') -install="$_pkgname.install" -source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png" - "http://download.$_pkgname-browser.org/$_pkgname/releases/source/$_pkgname-$pkgver-src.tar.gz" - 'netsurf.sh') -sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00' - '1ef12b2e2bc68f9eff8465646b7359e3cb483e1042aed750cc283a70dd4c540c' - '70310682d1612457d7bb3096549110b6ec127f50e97853259fada6be0c52924b') - -prepare() { - cd "$_pkgname-$pkgver" - - # remove non-privacy search providers - sed -i '\|Google|d - \|Yahoo|d - \|Bing|d - \|Business.com|d - \|Omgili|d - \|BBC News|d - \|Ubuntu Packages|d - \|Ask[.]com|d - \|Answers.com|d - \|Youtube|d - \|AeroMp3|d - \|AOL|d - \|Baidu|d - \|Amazon|d - \|Ebay|d - \|IMDB|d - \|ESPN|d - \|Aminet|d - \|OS4Depot|d - s|DuckDuckGo|DuckDuckGo HTML| - s|duckduckgo[.]com|duckduckgo.com/html| - s|duckduckgo[.]com/html/favicon.ico|duckduckgo.com/favicon.ico| - s|seeks-project.info|seeks.fr|g - ' gtk/res/SearchEngines \ - \!NetSurf/Resources/SearchEngines \ - amiga/resources/SearchEngines - sed -i '\|readable name such as| s|google|duckduckgo| - \|readable name such as| s|yahoo|seeks| - \|host address such as www[.]google[.]com| s|google[.]com|duckduckgo.com/html| - s|google[.]com?search=%s|duckduckgo.com/html/?q=%s| - \|return strdup| s|google[.]com|duckduckgo.com/html| - \|return strdup| s|google|duckduckgo| - \|return strdup| s|duckduckgo[.]com/html/favicon[.]ico|duckduckgo.com/favicon.ico| - s|www[.]google[.]com/search?q=%s|duckduckgo.com/html/?q=%s| - ' desktop/searchweb.c - sed -i 's|google[.][.a-z]\{0,6\}/search|duckduckgo.com/html/search| - s|Google-Suche|DuckDuckGo HTML| - s|Google Search|DuckDuckGo HTML| - s|Ricerca Google|DuckDuckGo HTML| - s|Google検索|DuckDuckGo HTML| - \|BBC News|d - \|Reuters|d - \|CNN|d - \|Slashdot|d - \|Ars Technica|d - \|The Register|d - \|W3C|d - s|google[.][.a-z]\{0,6\}|duckduckgo.com/html| - s|Google|DuckDuckGo HTML| - s|[.a-z]\{0,4\}yahoo[.]co[.a-z]\{0,4\}|www.seeks.fr| - s|Yahoo!|Seeks| - \|IMDB|d - s|The Icon Bar|Creative Commons| - s|www[.]iconbar[.]com|creativecommons.org| - s|ROOL|Dictionary.com| - s|www[.]riscosopen[.]org|dictionary.reference.com| - \|riscos.info|d - ' \!NetSurf/Resources/de/welcome.html\,faf \ - \!NetSurf/Resources/en/welcome.html\,faf \ - \!NetSurf/Resources/it/welcome.html\,faf \ - \!NetSurf/Resources/ja/welcome.html\,faf - sed -i 's|nsgenbind -g|nsgenbind| - ' javascript/Makefile - - cd .. - - gendesk -f --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --exec 'netsurf %U' \ - --genericname 'Web Browser' --comment 'Lightweight web browser' \ - --mimetypes 'text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo' -} - -build() { - make -C "$_pkgname-$pkgver" \ - PREFIX=/usr \ - TARGET=gtk \ - NETSURF_USE_WEBP=YES \ - NETSURF_USE_VIDEO=NO \ - NETSURF_USE_JS=NO \ - NETSURF_USE_MOZJS=NO # Javascript is disabled, for now. See FS#41582 -} - -package() { - make -C "$_pkgname-$pkgver" install PREFIX=/usr DESTDIR="$pkgdir" - mv "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/bin/$_pkgname.elf" - install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname" - install -Dm644 "$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png" - install -Dm644 "$_pkgname.desktop" \ - "$pkgdir/usr/share/applications/$_pkgname.desktop" - install -Dm644 "$_pkgname-$pkgver/COPYING" \ - "$pkgdir/usr/share/licenses/$_pkgname/LICENSE" - # use softlinks instead of hardlinks - rm -r "$pkgdir/usr/share/netsurf/C" - ln -s '/usr/share/netsurf/en' "$pkgdir/usr/share/netsurf/C" -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/netsurf-libre/netsurf.install b/libre/netsurf-libre/netsurf.install deleted file mode 100644 index ad97d7bab..000000000 --- a/libre/netsurf-libre/netsurf.install +++ /dev/null @@ -1,13 +0,0 @@ -post_upgrade() { - update-desktop-database -q -} - -post_install() { - post_upgrade -} - -post_remove() { - post_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/netsurf-libre/netsurf.sh b/libre/netsurf-libre/netsurf.sh deleted file mode 100644 index 01ff68450..000000000 --- a/libre/netsurf-libre/netsurf.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -shortname=`echo $LANG | cut -b1-2` -if [[ -d /usr/share/netsurf/$shortname ]]; then - /usr/bin/netsurf.elf "$@" -else - LANG=en /usr/bin/netsurf.elf "$@" -fi diff --git a/libre/netsurf/PKGBUILD b/libre/netsurf/PKGBUILD new file mode 100644 index 000000000..0a912302a --- /dev/null +++ b/libre/netsurf/PKGBUILD @@ -0,0 +1,123 @@ +# $Id: PKGBUILD 118143 2014-09-01 16:06:05Z arodseth $ +# Maintainer (Arch): Alexander Rødseth +# Contributor (Arch): Paulo Matias +# Contributor (Arch): Georgij Kondratjev +# Contributor (Arch): Daniel J Griffiths +# Maintainer: André Silva + +pkgname=netsurf +pkgver=3.2 +pkgrel=1.parabola1 +pkgdesc='Lightweight and fast web browser, without non-privacy search providers' +arch=('x86_64' 'i686' 'mips64el') +url='http://www.netsurf-browser.org/' +license=('MIT' 'GPL2') +replaces=(${pkgname}-libre) +conflicts=(${pkgname}-libre) +depends=('libmng' 'librsvg' 'libwebp' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.4.0' 'libdom>=0.1.1' 'gtk2') # gtk3 +makedepends=('re2c' 'gendesk' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind' 'inetutils') +install="$pkgname.install" +source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png" + "http://download.$pkgname-browser.org/$pkgname/releases/source/$pkgname-$pkgver-src.tar.gz" + 'netsurf.sh') +sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00' + '04ffeb8335c59cbc23371b79ae3b178002e6e95c35225ef62db4b155ecc7e213' + '70310682d1612457d7bb3096549110b6ec127f50e97853259fada6be0c52924b') + +prepare() { + cd "$pkgname-$pkgver" + + # remove non-privacy search providers + sed -i '\|Google|d + \|Yahoo|d + \|Bing|d + \|Business.com|d + \|Omgili|d + \|BBC News|d + \|Ubuntu Packages|d + \|Ask[.]com|d + \|Answers.com|d + \|Youtube|d + \|AeroMp3|d + \|AOL|d + \|Baidu|d + \|Amazon|d + \|Ebay|d + \|IMDB|d + \|ESPN|d + \|Aminet|d + \|OS4Depot|d + s|DuckDuckGo|DuckDuckGo HTML| + s|duckduckgo[.]com|duckduckgo.com/html| + s|duckduckgo[.]com/html/favicon.ico|duckduckgo.com/favicon.ico| + s|seeks-project.info|seeks.fr|g + ' gtk/res/SearchEngines \ + \!NetSurf/Resources/SearchEngines \ + amiga/resources/SearchEngines + sed -i '\|readable name such as| s|google|duckduckgo| + \|readable name such as| s|yahoo|seeks| + \|host address such as www[.]google[.]com| s|google[.]com|duckduckgo.com/html| + s|google[.]com?search=%s|duckduckgo.com/html/?q=%s| + \|return strdup| s|google[.]com|duckduckgo.com/html| + \|return strdup| s|google|duckduckgo| + \|return strdup| s|duckduckgo[.]com/html/favicon[.]ico|duckduckgo.com/favicon.ico| + s|www[.]google[.]com/search?q=%s|duckduckgo.com/html/?q=%s| + ' desktop/searchweb.c + sed -i 's|google[.][.a-z]\{0,6\}/search|duckduckgo.com/html/search| + s|Google-Suche|DuckDuckGo HTML| + s|Google Search|DuckDuckGo HTML| + s|Ricerca Google|DuckDuckGo HTML| + s|Google検索|DuckDuckGo HTML| + \|BBC News|d + \|Reuters|d + \|CNN|d + \|Slashdot|d + \|Ars Technica|d + \|The Register|d + \|W3C|d + s|google[.][.a-z]\{0,6\}|duckduckgo.com/html| + s|Google|DuckDuckGo HTML| + s|[.a-z]\{0,4\}yahoo[.]co[.a-z]\{0,4\}|www.seeks.fr| + s|Yahoo!|Seeks| + \|IMDB|d + s|The Icon Bar|Creative Commons| + s|www[.]iconbar[.]com|creativecommons.org| + s|ROOL|Dictionary.com| + s|www[.]riscosopen[.]org|dictionary.reference.com| + \|riscos.info|d + ' \!NetSurf/Resources/de/welcome.html\,faf \ + \!NetSurf/Resources/en/welcome.html\,faf \ + \!NetSurf/Resources/it/welcome.html\,faf \ + \!NetSurf/Resources/ja/welcome.html\,faf + sed -i 's|nsgenbind -g|nsgenbind| + ' javascript/Makefile + + cd .. + + gendesk -f --pkgname "$pkgname" --pkgdesc "$pkgdesc" --exec 'netsurf %U' \ + --genericname 'Web Browser' --comment 'Lightweight web browser' \ + --mimetypes 'text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo' +} + +build() { + make -C "$pkgname-$pkgver" \ + PREFIX=/usr \ + TARGET=gtk \ + NETSURF_USE_WEBP=YES \ + NETSURF_USE_VIDEO=NO \ + NETSURF_USE_JS=NO \ + NETSURF_USE_MOZJS=NO # Javascript is disabled, for now. See FS#41582 +} + +package() { + make -C "$pkgname-$pkgver" install PREFIX=/usr DESTDIR="$pkgdir" + mv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/bin/$pkgname.elf" + install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname" + install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "$pkgname-$pkgver/COPYING" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/netsurf/netsurf.install b/libre/netsurf/netsurf.install new file mode 100644 index 000000000..ad97d7bab --- /dev/null +++ b/libre/netsurf/netsurf.install @@ -0,0 +1,13 @@ +post_upgrade() { + update-desktop-database -q +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/netsurf/netsurf.sh b/libre/netsurf/netsurf.sh new file mode 100644 index 000000000..01ff68450 --- /dev/null +++ b/libre/netsurf/netsurf.sh @@ -0,0 +1,7 @@ +#!/bin/sh +shortname=`echo $LANG | cut -b1-2` +if [[ -d /usr/share/netsurf/$shortname ]]; then + /usr/bin/netsurf.elf "$@" +else + LANG=en /usr/bin/netsurf.elf "$@" +fi -- cgit v1.2.3