summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucki2015-08-30 22:19:06 +0200
committerLucki2015-08-30 22:19:06 +0200
commit4c44e3b8150765dfada49bb841216f7db2610858 (patch)
tree46d3a49a8460e8781b3985e2ce1842c7ce59fae9
parentf40971f7c5bd4e89b92d0e9ecc919d55f266dfe7 (diff)
downloadaur-4c44e3b8150765dfada49bb841216f7db2610858.tar.gz
Change buildsystem to gradle
Makes the workaround for OpenJDK unnecessary
-rw-r--r--.CHANGELOG105
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD44
-rw-r--r--pom.patch12
4 files changed, 69 insertions, 98 deletions
diff --git a/.CHANGELOG b/.CHANGELOG
index 02f6d3cb1c24..3974aecd226c 100644
--- a/.CHANGELOG
+++ b/.CHANGELOG
@@ -1,85 +1,88 @@
-* commit 6a4c6a8d37844a8263bad8537c4227f991ff2f05
+* commit 31d0c237dffee5aa586fdda49a08e2e75d03a8d2
| Author: Jeffrey Han <itdelatrisu@gmail.com>
-| Date: Sat Jul 18 23:55:06 2015 -0500
+| Date: Sun Aug 30 14:31:01 2015 -0500
|
-| Updating to version 0.10.1.
+| Create Natives dir in XDG_CACHE_HOME, not the working dir. (fixes #129)
|
| Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
|
-* commit 5dac21a5458bb2f3f963926f642a47d69628b72b
+* commit 9fc00fc3c383ec23842dc76869033da4af041fc2
| Author: Jeffrey Han <itdelatrisu@gmail.com>
-| Date: Thu Jul 16 18:14:46 2015 -0500
+| Date: Sat Aug 29 09:51:10 2015 -0500
|
-| Cursor trail now considers actual FPS (not target FPS). (fixes #109)
+| Follow-up to #128: add XDG info to readme, rename the Maven property.
|
| Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
+|
+* commit 331865c437b72d819455605cbfd381abc7af5755
+|\ Merge: c283975 fad4435
+| | Author: Jeffrey Han <itdelatrisu@users.noreply.github.com>
+| | Date: Sat Aug 29 09:28:28 2015 -0500
+| |
+| | Merge pull request #128 from Lucki/patch-1
+| |
+| | Make the XDG-option available from command line with Gradle
+| |
+| * commit fad44356e621c3f5d5a3b9b8b1b60a22f4eec7c3
+|/ Author: Lucki <Lucki@users.noreply.github.com>
+| Date: Sat Aug 29 13:05:24 2015 +0200
+|
+| Make the XDG-option available from command line
+|
+| I've found no way to access it without this workaround: https://discuss.gradle.org/t/can-i-override-the-group-property-from-the-command-line/5294
+| It's now possible to build with `gradle jar -PXDG=true`.
|
-* commit 4e2074e41bc399c848850bfebc2af79b5579ed9a
+* commit c2839759b3e3bf300f7f3ff9ada017e8a4cb6462
| Author: Jeffrey Han <itdelatrisu@gmail.com>
-| Date: Sat Jul 11 10:51:52 2015 -0500
+| Date: Sat Aug 29 00:46:39 2015 -0500
|
-| Show errors if any directories could not be created. (fixes #97)
+| Follow-up to 2d83c3a: forgot to include a description of .opsu.log.
|
| Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
|
-* commit 05c7ac0a02d1f85927a39a0b7d29fb6ed31e9595
+* commit 2d83c3a3485bb6dfdc936d9767076f0c95e40e4f
| Author: Jeffrey Han <itdelatrisu@gmail.com>
-| Date: Thu Jul 9 11:59:53 2015 -0500
+| Date: Sat Aug 29 00:32:08 2015 -0500
|
-| Minor follow-up to #108.
-| Set minimum OpenGL version for mmsliders to 3.0 (from 3.2) and removed an unused variable.
+| Added "Directory Structure" section to the readme, with other changes.
|
| Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
-|
-* commit 2be92ecdcaf1edbe9624afb01ae17ce6e3161cc5
-|\ Merge: 26ab619 7941a70
-| | Author: Jeffrey Han <itdelatrisu@users.noreply.github.com>
-| | Date: Thu Jul 9 11:54:27 2015 -0500
-| |
-| | Merge pull request #108 from Bigpet/viewport_fix
-| |
-| | Backup and restore the viewport size when rendering sliders
-| |
-| * commit 7941a70238ad2a54e5f69359e10e6ff0f7813eb6
-| | Author: Peter Tissen <dravorek@gmail.com>
-| | Date: Thu Jul 9 18:37:39 2015 +0200
-| |
-| | use EXT version of FBOs instead of the ARB version
-| |
-| | This doesn't actually make a difference in functionality.
-| | The issue is that the flashlight mod uses Slicks FBO functions which
-| | use the EXT version and Intel drivers generate the same FBO IDs twice
-| | if the EXT and ARB versions are mixed.
-| |
-| * commit 420f1fb02cbdbad90c28ed5c484f118e499d3fcd
-|/ Author: Peter Tissen <dravorek@gmail.com>
-| Date: Wed Jul 8 16:18:41 2015 +0200
-|
-| Backup and restore the viewport size when rendering sliders. Needed because Slick tends to allocate offscreen buffers for itself only with power of two textures, so it will use another viewport when rendering to its own offscreen buffers.
|
-* commit 26ab61910e051dfb1dac5b8258b70bcf7df7ac8e
+* commit 6d284cdd80a8bb1a4b57679e9c1a001527d9fc3f
| Author: Jeffrey Han <itdelatrisu@gmail.com>
-| Date: Tue Jul 7 19:03:54 2015 -0500
+| Date: Fri Aug 28 21:29:21 2015 -0500
|
-| Added option to disable automatic checking for updates.
+| Organize imports.
+| Some of these got re-ordered when I updated Eclipse -- resetting to the original sort order.
|
| Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
|
-* commit 8b9e230fa75c3178f59dfee28ffbf2f127b589c3
+* commit 34c7942f4bd3e70a80890e4b3d1176939ddfbd8f
| Author: Jeffrey Han <itdelatrisu@gmail.com>
-| Date: Tue Jul 7 18:37:03 2015 -0500
+| Date: Fri Aug 28 21:12:47 2015 -0500
|
-| Updated dependencies.
-| - LWJGL is now at the final 2.x release version.
-| - Slick2D is now at the final (?) release version.
-| - Added dependency for org.tukaani.xz, since it becomes optional in commons-compress 1.9 and is needed for LZMA compression.
+| Fixed "Hidden" mod timing issues. (fixes #121)
+| This introduces more accurate timing formulas associated with the "Hidden" mod (previously, in #115, these values were hardcoded). The values seem somewhat close to the values in osu!, but were not extensively tested.
+|
+| Also set an upper bound on the fade in time for hit objects proportional to the approach time, or else the timing values in the "Hidden" mod would be too inconsistent.
|
| Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
|
-* commit 47f682352dd65cb322fb02907af219ba5e882472
+* commit c4f54ecc0594cb867d24dde4386d768133b3ff1d
| Author: Jeffrey Han <itdelatrisu@gmail.com>
-| Date: Sat Jul 4 23:29:46 2015 -0500
+| Date: Fri Aug 28 19:41:02 2015 -0500
|
-| Updating to version 0.10.0.
+| Hitting the "f" key during a replay changes the playback speed.
+|
+| Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
+|
+* commit f773a8ecf8a2b02c444b9326972047124b07e892
+| Author: Jeffrey Han <itdelatrisu@gmail.com>
+| Date: Fri Aug 28 11:07:03 2015 -0500
+|
+| Remove jinput dependency since controllers aren't used.
+| jinput natives are no longer loaded or packaged in the jar.
+|
+| Excluded the lwjgl dependency within the slick2d package since it depends on an older version (2.9.1) of lwjgl.
|
| Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
diff --git a/.SRCINFO b/.SRCINFO
index 3cc81fedcb08..231a26bdcecc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = opsu-git
pkgdesc = An open source osu!-client written in Java.
- pkgver = 0.10.1.r0.g6a4c6a8
+ pkgver = 0.10.1.r64.g31d0c23
pkgrel = 1
url = https://itdelatrisu.github.io/opsu/
changelog = .CHANGELOG
@@ -8,7 +8,7 @@ pkgbase = opsu-git
license = GPL3
makedepends = java-environment
makedepends = java-web-start
- makedepends = maven
+ makedepends = gradle
makedepends = gendesk
makedepends = git
depends = java-runtime
@@ -16,10 +16,8 @@ pkgbase = opsu-git
provides = opsu-git
conflicts = opsu-git
source = opsu-git::git://github.com/itdelatrisu/opsu.git
- source = pom.patch
source = opsu-git.sh
sha512sums = SKIP
- sha512sums = 72c56c8f0c647fcdbf85a32e7c4bf1a37b7176015f08402dc20b707f11c5cbb78be1da81d4a697c9d842ac28a9a0bcf1f4c8252c2a18e2ee35435cd327da683b
sha512sums = 4c8b89b4f273a076620c98058623a0e8c0ab875f191cb65f126e9a0134e0b072ed27ac8a03928225db1b5b9e832935b4efca0db1d7a02b0c8b96ec87748398f3
pkgname = opsu-git
diff --git a/PKGBUILD b/PKGBUILD
index 0b750b20d89b..57a5c0086ebf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Lucki <Lucki at holarse-linuxgaming dot de>
pkgname=opsu-git
-pkgver=0.10.1.r0.g6a4c6a8
+pkgver=0.10.1.r64.g31d0c23
pkgrel=1
pkgdesc="An open source osu!-client written in Java."
arch=('any')
@@ -10,19 +10,17 @@ url="https://itdelatrisu.github.io/opsu/"
license=('GPL3')
changelog=.CHANGELOG
depends=('java-runtime' 'bash')
-makedepends=('java-environment' 'java-web-start' 'maven' 'gendesk' 'git')
+makedepends=('java-environment' 'java-web-start' 'gradle' 'gendesk' 'git')
provides=('opsu-git')
conflicts=('opsu-git')
-source=( ${pkgname}::git://github.com/itdelatrisu/opsu.git
- pom.patch
- opsu-git.sh )
+source=(${pkgname}::git://github.com/itdelatrisu/opsu.git
+ opsu-git.sh )
sha512sums=('SKIP'
- '72c56c8f0c647fcdbf85a32e7c4bf1a37b7176015f08402dc20b707f11c5cbb78be1da81d4a697c9d842ac28a9a0bcf1f4c8252c2a18e2ee35435cd327da683b'
'4c8b89b4f273a076620c98058623a0e8c0ab875f191cb65f126e9a0134e0b072ed27ac8a03928225db1b5b9e832935b4efca0db1d7a02b0c8b96ec87748398f3')
pkgver()
{
- cd ${srcdir}/${pkgname}
+ cd "${srcdir}/${pkgname}"
git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
@@ -32,39 +30,23 @@ prepare()
gendesk -n -f --pkgname ${pkgname} --pkgdesc "$pkgdesc" --name "opsu!-git" --exec "${pkgname}" --categories "Game"
# update .CHANGELOG
- git -C ${srcdir}/${pkgname} log --graph -10 > ${startdir}/.CHANGELOG
-
- # check for openjdk
- if [[ ! $(archlinux-java get | sed -r 's/.*(.{7})/\1/') == "openjdk" ]]; then
- msg "OpenJDK not found, trying OracleJDK"
-
- # cut part for OpenJDK
- sed -e '4q' ${srcdir}/pom.patch > ${srcdir}/pom2.patch
-
- # patch pom.xml
- patch ${srcdir}/${pkgname}/pom.xml ${srcdir}/pom2.patch
- else
- msg "OpenJDK found, using systempath"
-
- # patch pom.xml
- patch ${srcdir}/${pkgname}/pom.xml ${srcdir}/pom.patch
- fi
+ git -C "${srcdir}/${pkgname}" log --graph -10 > "${startdir}/.CHANGELOG"
}
build()
{
- cd ${srcdir}/${pkgname}
- mvn install -Djar
+ cd "${srcdir}/${pkgname}"
+ gradle jar -PXDG=true
}
package()
{
# cut pkgver
- _pkgver=$(git -C ${srcdir}/${pkgname} describe --tags | sed 's/-.*//')
+ _pkgver=$(git -C "${srcdir}/${pkgname}" describe --tags | sed 's/-.*//')
_pkgname=opsu
- install -Dm644 ${srcdir}/${pkgname}/target/${_pkgname}-${_pkgver}-runnable.jar ${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar
- install -Dm644 ${srcdir}/${pkgname}/res/logo.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png
- install -Dm644 ${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
- install -Dm755 ${pkgname}.sh ${pkgdir}/usr/bin/${pkgname}
+ install -Dm644 "${srcdir}/${pkgname}/build/libs/${_pkgname}-${_pkgver}.jar" "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar"
+ install -Dm644 "${srcdir}/${pkgname}/res/logo.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+ install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+ install -Dm755 "${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
}
diff --git a/pom.patch b/pom.patch
deleted file mode 100644
index d59c961965e4..000000000000
--- a/pom.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-92c92
-< <!--<argument>-Dparams=-DXDG=true</argument>-->
----
-> <argument>-Dparams=-DXDG=true</argument>
-151a152,158
-> <dependency>
-> <groupId>javax.jnlp</groupId>
-> <artifactId>jnlp-api</artifactId>
-> <version>1.0.0</version>
-> <scope>system</scope>
-> <systemPath>/usr/bin/javaws</systemPath>
-> </dependency>