From 32c032e9f52d3d2b508466c6d643086444f37ae8 Mon Sep 17 00:00:00 2001 From: Alex Tharp Date: Wed, 19 Jul 2017 12:43:20 -0500 Subject: [PATCH] feat: new foobar2000-component-audioscrobbler-bin package, update existing packages & structure --- README.md | 7 +- .../PKGBUILD | 17 +++++ .../README.md | 4 ++ {hifi-interface => hifi-git}/PKGBUILD | 67 +++++++++--------- {hifi-interface => hifi-git}/README.md | 4 +- hifi-git/hifi-assignment-client.launcher | 5 ++ hifi-git/hifi-domain-server.launcher | 5 ++ hifi-git/hifi-git.install | 14 ++++ hifi-git/hifi-ice-server.launcher | 5 ++ .../hifi-interface.desktop | 0 hifi-git/hifi-interface.launcher | 5 ++ .../hifi-interface.png | Bin {polyvox => polyvox-git}/PKGBUILD | 9 +-- polyvox-git/README.md | 6 ++ polyvox/README.md | 6 -- 15 files changed, 106 insertions(+), 48 deletions(-) create mode 100644 foobar2000-component-audioscrobbler-bin/PKGBUILD create mode 100644 foobar2000-component-audioscrobbler-bin/README.md rename {hifi-interface => hifi-git}/PKGBUILD (52%) rename {hifi-interface => hifi-git}/README.md (58%) create mode 100644 hifi-git/hifi-assignment-client.launcher create mode 100644 hifi-git/hifi-domain-server.launcher create mode 100644 hifi-git/hifi-git.install create mode 100644 hifi-git/hifi-ice-server.launcher rename {hifi-interface => hifi-git}/hifi-interface.desktop (100%) create mode 100644 hifi-git/hifi-interface.launcher rename {hifi-interface => hifi-git}/hifi-interface.png (100%) rename {polyvox => polyvox-git}/PKGBUILD (77%) create mode 100644 polyvox-git/README.md delete mode 100644 polyvox/README.md diff --git a/README.md b/README.md index 195fa52..af3fa5f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ aur-packages ============ -Some neato PKGBUILDs for Arch I've made available on AUR +Some neato [PKGBUILDs](https://wiki.archlinux.org/index.php/PKGBUILD) for [Arch Linux](https://www.archlinux.org/) I've made available on [AUR](https://aur.archlinux.org/) -* [hifi-interface-git](hifi-interface) - PKGBUILD to package the [High Fidelity](https://highfidelity.io/) virtual world client project -* [polyvox-git](polyvox) - PKGBUILD to package the [PolyVox](http://www.volumesoffun.com/polyvox-about/) library, intended for storing, manipulating, and displaying volumetric representations of objects +* [hifi-git](hifi-git) - Provides the [High Fidelity](https://highfidelity.io/) virtual world project (client and servers) +* [polyvox-git](polyvox-git) - Provides the [PolyVox](http://www.volumesoffun.com/polyvox-about/) library, intended for storing, manipulating, and displaying volumetric representations of objects +* [foobar2000-component-audioscrobbler-bin](foobar2000-component-audioscrobbler-bin) - Provides [foo_audioscrobbler](http://www.foobar2000.org/components/view/foo_audioscrobbler), a [Last.fm/Audioscrobbler](https://www.last.fm/) component for [foobar2000](https://www.foobar2000.org/) diff --git a/foobar2000-component-audioscrobbler-bin/PKGBUILD b/foobar2000-component-audioscrobbler-bin/PKGBUILD new file mode 100644 index 0000000..6e51bf7 --- /dev/null +++ b/foobar2000-component-audioscrobbler-bin/PKGBUILD @@ -0,0 +1,17 @@ +# Maintainer: Alex Tharp + +pkgname=foobar2000-component-audioscrobbler-bin +pkgver=1.4.7 +pkgrel=1 +pkgdesc="A Last.fm/Audioscrobbler component for foobar2000" +arch=('any') +url="https://www.foobar2000.org/components/view/foo_audioscrobbler" +license=('unknown') +depends=('foobar2000>=1.0.0') +conflicts=('foobar2000-audioscrobbler-bin') +source=("http://download.mp3tag.de/foo_audioscrobbler-1.4.7.zip") +md5sums=('51f9a03adb7cd169ac43d2fc89d544c3') + +package() { + install -Dm644 -t "$pkgdir/usr/share/foobar2000/components" "$srcdir/foo_audioscrobbler.dll" +} diff --git a/foobar2000-component-audioscrobbler-bin/README.md b/foobar2000-component-audioscrobbler-bin/README.md new file mode 100644 index 0000000..8394a42 --- /dev/null +++ b/foobar2000-component-audioscrobbler-bin/README.md @@ -0,0 +1,4 @@ +foobar2000-component-audioscrobbler-bin +============ + +Provides [foo_audioscrobbler](http://www.foobar2000.org/components/view/foo_audioscrobbler), a [Last.fm/Audioscrobbler](https://www.last.fm/) component for [foobar2000](https://www.foobar2000.org/) diff --git a/hifi-interface/PKGBUILD b/hifi-git/PKGBUILD similarity index 52% rename from hifi-interface/PKGBUILD rename to hifi-git/PKGBUILD index e5256d6..bb40fdd 100644 --- a/hifi-interface/PKGBUILD +++ b/hifi-git/PKGBUILD @@ -1,16 +1,16 @@ # Maintainer: Alex Tharp -# Contributor: Bennett Goble -# Upstream URL: https://github.com/highfidelity/hifi -# Issues: https://github.com/toastercup/aur-packages/issues -pkgname=hifi-interface-git -pkgver=r40509.9e0d9f5 -pkgrel=1 -pkgdesc="High Fidelity is an open, decentralized virtual world using sensors to control avatars and dynamically assigned devices as servers (git - master)" +pkgname=hifi-git +pkgver=r50816.f4e57898c6 +pkgrel=2 +pkgdesc="High Fidelity is an open, decentralized virtual world using sensors to control avatars and dynamically assigned devices as servers. This provides the client, servers and dev tools. (git - master)" arch=('i686' 'x86_64') url="https://github.com/highfidelity/hifi" -license=('Apache2') +license=('Apache') +install="${pkgname}.install" makedepends=('git' 'cmake>=2.8.12.2') +provides=('hifi') +conflicts=('hifi') _qt5version=5.5.1 depends=("qt5-base>=$_qt5version" "qt5-script>=$_qt5version" @@ -37,63 +37,64 @@ depends=("qt5-base>=$_qt5version" 'libsoxr>=0.1.1' 'qxmpp-qt5' ) -conflicts=('hifi-interface') -provides=('hifi-interface') _githifi=hifi _gitgverb=gverb source=("$_githifi::git+https://github.com/highfidelity/hifi.git" "$_gitgverb::git+https://github.com/highfidelity/gverb.git" 'hifi-interface.desktop' - 'hifi-interface.png') + 'hifi-interface.png' + 'hifi-assignment-client.launcher' + 'hifi-domain-server.launcher' + 'hifi-ice-server.launcher' + 'hifi-interface.launcher') md5sums=('SKIP' 'SKIP' '2cc1b0cbdc7b044d76fce091117d09cb' - 'a261965ec09a8dfd93175fdabb7cafbe') + 'a261965ec09a8dfd93175fdabb7cafbe' + '1eac79a3bc2179a4026ea1c6765fd44a' + 'ebb90bc133cb39d9d53b22fe8a954126' + '8405ec1a861b25e92c9640cdae8a3776' + 'ff5de09932f33f6e4f4e4093a4b5e1d8') pkgver() { cd "$srcdir/$_githifi" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } -build() { +prepare() { # Symlink required gverb sources mkdir -p "$srcdir/$_githifi/interface/external/gverb" && mkdir -p "$srcdir/$_githifi/libraries/audio-client/external/gverb" ln -s -f "$srcdir/$_gitgverb/include" "$srcdir/$_githifi/interface/external/gverb/" ln -s -f "$srcdir/$_gitgverb/src" "$srcdir/$_githifi/interface/external/gverb/" ln -s -f "$srcdir/$_gitgverb/include" "$srcdir/$_githifi/libraries/audio-client/external/gverb/" ln -s -f "$srcdir/$_gitgverb/src" "$srcdir/$_githifi/libraries/audio-client/external/gverb/" +} +build() { cd $srcdir && mkdir -p build && cd $_ - cmake -DCMAKE_INSTALL_PREFIX:PATH="$pkgdir/opt/interface" -DCMAKE_BUILD_TYPE:STRING=Release "../$_githifi" + cmake -DCMAKE_INSTALL_PREFIX:PATH="$pkgdir/opt/hifi/interface" -DCMAKE_BUILD_TYPE:STRING=Release "../$_githifi" make } package() { - install -Dm644 hifi-interface.png "$pkgdir/usr/share/pixmaps/hifi-interface.png" - xdg-desktop-menu install --mode system hifi-interface.desktop + install -Dm644 "$srcdir/hifi-interface.png" "$pkgdir/usr/share/pixmaps/hifi-interface.png" + install -Dm644 "$srcdir/hifi-interface.desktop" "$pkgdir/usr/share/applications/hifi-interface.desktop" mkdir -p "$pkgdir/usr/bin" - cd "$srcdir/build" #TODO: create patched CMAKE with make install target - install -Dm755 assignment-client/assignment-client "$pkgdir/opt/hifi/assignment-client" - ln -s "$pkgdir/opt/hifi/assignment-client" "$pkgdir/usr/bin/assignment-client" - - install -Dm755 domain-server/domain-server "$pkgdir/opt/hifi/domain-server/domain-server" - cp -R domain-server/resources "$pkgdir/opt/hifi/domain-server/" - ln -s "$pkgdir/opt/hifi/domain-server/domain-server" "$pkgdir/usr/bin/domain-server" - - install -Dm755 ice-server/ice-server "$pkgdir/opt/hifi/ice-server" - ln -s "$pkgdir/opt/hifi/ice-server" "$pkgdir/usr/bin/ice-server" + install -Dm755 "$srcdir/build/assignment-client/assignment-client" "$pkgdir/opt/hifi/assignment-client" + install -Dm755 "$srcdir/hifi-assignment-client.launcher" "$pkgdir/usr/bin/hifi-assignment-client" - install -Dm755 interface/interface "$pkgdir/opt/hifi/interface/interface" - cp -R interface/resources "$pkgdir/opt/hifi/interface/" - ln -s "$pkgdir/opt/hifi/interface/interface" "$pkgdir/usr/bin/interface" + install -Dm755 "$srcdir/build/domain-server/domain-server" "$pkgdir/opt/hifi/domain-server/domain-server" + cp -R "$srcdir/build/domain-server/resources" "$pkgdir/opt/hifi/domain-server/" + install -Dm755 "$srcdir/hifi-domain-server.launcher" "$pkgdir/usr/bin/hifi-domain-server" - install -Dm755 tools/mtc/mtc "$pkgdir/opt/hifi/tools/mtc" - ln -s "$pkgdir/opt/hifi/tools/mtc" "$pkgdir/usr/bin/mtc" + install -Dm755 "$srcdir/build/ice-server/ice-server" "$pkgdir/opt/hifi/ice-server" + install -Dm755 "$srcdir/hifi-ice-server.launcher" "$pkgdir/usr/bin/hifi-ice-server" - install -Dm755 tools/scribe/scribe "$pkgdir/opt/hifi/tools/scribe" - ln -s "$pkgdir/opt/hifi/tools/scribe" "$pkgdir/usr/bin/scribe" + install -Dm755 "$srcdir/build/interface/interface" "$pkgdir/opt/hifi/interface/interface" + cp -R "$srcdir/build/interface/resources" "$pkgdir/opt/hifi/interface/" + install -Dm755 "$srcdir/hifi-interface.launcher" "$pkgdir/usr/bin/hifi-interface" } diff --git a/hifi-interface/README.md b/hifi-git/README.md similarity index 58% rename from hifi-interface/README.md rename to hifi-git/README.md index e38e8f7..5e0a49a 100644 --- a/hifi-interface/README.md +++ b/hifi-git/README.md @@ -1,7 +1,7 @@ -hifi-interface-git +hifi-git ============ Open, decentralized virtual world using sensors to control avatars and dynamically assigned devices as servers. -PKGBUILD to package the [High Fidelity](https://highfidelity.io/) virtual world client project. +Provides the [High Fidelity](https://highfidelity.io/) virtual world project (client and servers). Builds from git (`master` branch) diff --git a/hifi-git/hifi-assignment-client.launcher b/hifi-git/hifi-assignment-client.launcher new file mode 100644 index 0000000..f0751ce --- /dev/null +++ b/hifi-git/hifi-assignment-client.launcher @@ -0,0 +1,5 @@ +#!/bin/sh + +cd "/opt/hifi/" +./assignment-client $* +exit $? diff --git a/hifi-git/hifi-domain-server.launcher b/hifi-git/hifi-domain-server.launcher new file mode 100644 index 0000000..ef82cfb --- /dev/null +++ b/hifi-git/hifi-domain-server.launcher @@ -0,0 +1,5 @@ +#!/bin/sh + +cd "/opt/hifi/domain-server/" +./domain-server $* +exit $? diff --git a/hifi-git/hifi-git.install b/hifi-git/hifi-git.install new file mode 100644 index 0000000..492efe1 --- /dev/null +++ b/hifi-git/hifi-git.install @@ -0,0 +1,14 @@ +post_install() { + echo + echo "==> The following can now be executed:" + echo "==> hifi-interface: The graphical archways to the boundless multiverse." + echo "==> hifi-domain-server: Provides assignments to the assignment-client for features such as audio, avatars, particles, etc." + echo "==> hifi-assignment-client: This pulls an assignment from the queue and executes it." + echo "==> hifi-ice-server: Orchestrates domain-server's ability to be accessed by avatars on the Internet without requiring firewall configuration." + echo + echo "==> To run your own server, follow the readme:" + echo "==> https://github.com/highfidelity/hifi#running-your-own-servers" + echo "==> ..and the online documentation:" + echo "==> https://readme.highfidelity.com/docs/domain-setup-quickstart" + echo +} diff --git a/hifi-git/hifi-ice-server.launcher b/hifi-git/hifi-ice-server.launcher new file mode 100644 index 0000000..21d40db --- /dev/null +++ b/hifi-git/hifi-ice-server.launcher @@ -0,0 +1,5 @@ +#!/bin/sh + +cd "/opt/hifi/" +./ice-server $* +exit $? diff --git a/hifi-interface/hifi-interface.desktop b/hifi-git/hifi-interface.desktop similarity index 100% rename from hifi-interface/hifi-interface.desktop rename to hifi-git/hifi-interface.desktop diff --git a/hifi-git/hifi-interface.launcher b/hifi-git/hifi-interface.launcher new file mode 100644 index 0000000..c58d3e9 --- /dev/null +++ b/hifi-git/hifi-interface.launcher @@ -0,0 +1,5 @@ +#!/bin/sh + +cd "/opt/hifi/interface/" +./interface $* +exit $? diff --git a/hifi-interface/hifi-interface.png b/hifi-git/hifi-interface.png similarity index 100% rename from hifi-interface/hifi-interface.png rename to hifi-git/hifi-interface.png diff --git a/polyvox/PKGBUILD b/polyvox-git/PKGBUILD similarity index 77% rename from polyvox/PKGBUILD rename to polyvox-git/PKGBUILD index 98d32ae..efc0302 100644 --- a/polyvox/PKGBUILD +++ b/polyvox-git/PKGBUILD @@ -2,8 +2,8 @@ # Issues: https://github.com/toastercup/aur-packages/issues pkgname=polyvox-git -pkgver=r1108.95f0aa2 -pkgrel=1 +pkgver=r2156.c986c9f0 +pkgrel=2 pkgdesc="PolyVox is a library for storing, manipulating, and displaying volumetric representations of objects" arch=('i686' 'x86_64') url="http://www.volumesoffun.com/polyvox-about/" @@ -21,7 +21,7 @@ pkgver() { build() { cd $srcdir && mkdir -p build && cd $_ - cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:STRING=Release "../$pkgname" + cmake -DENABLE_EXAMPLES=OFF -DENABLE_TESTS=OFF -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:STRING=Release "../$pkgname" make } @@ -29,5 +29,6 @@ package() { cd "$srcdir/build" make DESTDIR="$pkgdir/" install mkdir -p "$pkgdir/usr/share/licenses/$pkgname/" - cp "$srcdir/$pkgname/LICENSE.TXT" "$pkgdir/usr/share/licenses/$pkgname/" + cp "$srcdir/$pkgname/LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/" } + diff --git a/polyvox-git/README.md b/polyvox-git/README.md new file mode 100644 index 0000000..7bd7418 --- /dev/null +++ b/polyvox-git/README.md @@ -0,0 +1,6 @@ +polyvox-git +============ + +Provides the [PolyVox](http://www.volumesoffun.com/polyvox-about/) library, intended for storing, manipulating, and displaying volumetric representations of objects. + +Builds from git (`master` branch) diff --git a/polyvox/README.md b/polyvox/README.md deleted file mode 100644 index 883df63..0000000 --- a/polyvox/README.md +++ /dev/null @@ -1,6 +0,0 @@ -polyvox-git -============ - -PKGBUILD to package the [PolyVox](http://www.volumesoffun.com/polyvox-about/) library, intended for storing, manipulating, and displaying volumetric representations of objects. - -Builds from git (`master` branch)