Initial import

5 files changed, 203 insertions, 0 deletions

diff --git a/.CHANGELOG b/.CHANGELOG
new file mode 100644
index 000000000000..8a11b69c297e
--- /dev/null
+++ b/.CHANGELOG
@@ -0,0 +1,93 @@
+* commit 92f4a5176d09d82cfd481e4de0db9abbb2265185
+| Author: Jeffrey Han <itdelatrisu@gmail.com>
+| Date:   Tue Jun 9 03:10:44 2015 -0400
+| 
+|     Switch to a LRU cache for beatmap background images.
+|     Created a separate BeatmapImageCache class to handle cache operations.  The cache now uses File objects as keys, rather than Beatmap objects (which was buggy).
+|     
+|     Also renamed "OsuHitObjectResult" helper class to "HitObjectResult".
+|     
+|     Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
+|  
+* commit 74f7ac18b9d9f8d10db11b4fa0c7b061e5294d8b
+| Author: Jeffrey Han <itdelatrisu@gmail.com>
+| Date:   Mon Jun 8 18:13:49 2015 -0400
+| 
+|     Fixed an infinite loop on beatmaps starting at time 0. (blame: 18e57fd)
+|     There's probably a better fix, though...
+|     
+|     Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
+|  
+* commit e712d57a2c11e4ca5d9e6ac9607d3c9f7bb9bc0e
+| Author: Jeffrey Han <itdelatrisu@gmail.com>
+| Date:   Mon Jun 8 17:23:45 2015 -0400
+| 
+|     Cleaned up implementation of beatmap combo colors.
+|     Added getComboColors() method to Beatmap class, and the 'combo' field is now null if no combo is provided.
+|     
+|     Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
+|  
+* commit b1b1664e1118704f8d70643b6c5d57c63f09fbff
+| Author: Jeffrey Han <itdelatrisu@gmail.com>
+| Date:   Mon Jun 8 16:42:54 2015 -0400
+| 
+|     Follow-up to #91.
+|     Pass the border color into CurveRenderState instead of determining it there; store the color as a static field in Curve (since it shouldn't change per-beatmap).
+|     
+|     Also removed the leftover FrameBufferCache warning from #64.
+|     
+|     Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
+|    
+*   commit a7d05a4b2619fec025a3b4a0e67c7a9e4aa3f31a
+|\  Merge: 447a0f3 890a69c
+| | Author: Jeffrey Han <itdelatrisu@users.noreply.github.com>
+| | Date:   Mon Jun 8 16:22:03 2015 -0400
+| | 
+| |     Merge pull request #91 from Bigpet/bordercolor
+| |     
+| |     recolor the slider border from the skin or beatmap settings
+| |   
+| * commit 890a69c1a93b718a5fd622b04f9fe0b57bbcfab0
+|/  Author: Peter Tissen <dravorek@gmail.com>
+|   Date:   Mon Jun 8 22:07:24 2015 +0200
+|   
+|       recolor the slider border from the skin or beatmap settings
+|  
+* commit 447a0f371a45512cec8495e064bb5cfcb2a38cc6
+| Author: Jeffrey Han <itdelatrisu@gmail.com>
+| Date:   Mon Jun 8 15:57:17 2015 -0400
+| 
+|     Added missing "SliderBorder" field to BeatmapParser.
+|     Use beatmap.getSliderBorderColor() to get the slider border color for a beatmap.
+|     
+|     Also adds the field to the beatmap cache, and fixes a bug where format changes would cause an exception when preparing statements in the new format.
+|     
+|     Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
+|  
+* commit b6f208a47d017c5bdc9054711e67cee7e280a788
+| Author: Jeffrey Han <itdelatrisu@gmail.com>
+| Date:   Mon Jun 8 15:02:28 2015 -0400
+| 
+|     Follow-up to #64.
+|     - Removed NEW_SLIDER option, and use the skin "SliderStyle" instead.  Uses the new style by default, unless STYLE_PEPPYSLIDER is specified.
+|     - Check if OpenGL 3.0 is supported before trying to draw new style sliders.
+|     - Fixed compilation warnings; removed unneeded fields and imports.
+|     - Filled in some missing Javadocs.
+|     - Style changes.
+|     
+|     Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
+|    
+*   commit 9c8a8f24c6982b7b1c18fe6c1243d6e40f2607a2
+|\  Merge: 90c8c9e 609739e
+| | Author: Jeffrey Han <itdelatrisu@users.noreply.github.com>
+| | Date:   Mon Jun 8 13:58:08 2015 -0400
+| | 
+| |     Merge pull request #64 from Bigpet/sliderrender
+| |     
+| |     Slider rendering to offscreen buffer
+| |   
+| * commit 609739e153bd12b17165f1394ad191b3a3c9e0de
+| | Author: Peter Tissen <dravorek@gmail.com>
+| | Date:   Mon Jun 8 19:11:07 2015 +0200
+| | 
+| |     ignore UIScale for reading raw image pixels
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..e4a82edd14cb
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,26 @@
+pkgbase = opsu-git
+	pkgdesc = An open source osu!-client written in Java.
+	pkgver = 0.9.0.r22.g92f4a51
+	pkgrel = 1
+	url = https://itdelatrisu.github.io/opsu/
+	changelog = .CHANGELOG
+	arch = any
+	license = GPL3
+	makedepends = java-environment
+	makedepends = java-web-start
+	makedepends = maven
+	makedepends = gendesk
+	makedepends = git
+	depends = java-runtime
+	depends = bash
+	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
new file mode 100644
index 000000000000..bc6694591e01
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,70 @@
+# Contributor in comments: Misc <https://aur.archlinux.org/account/misc/>
+# Maintainer: Lucki <Lucki at holarse-linuxgaming dot de>
+
+pkgname=opsu-git
+pkgver=0.9.0.r22.g92f4a51
+pkgrel=1
+pkgdesc="An open source osu!-client written in Java."
+arch=('any')
+url="https://itdelatrisu.github.io/opsu/"
+license=('GPL3')
+changelog=.CHANGELOG
+depends=('java-runtime' 'bash')
+makedepends=('java-environment' 'java-web-start' 'maven' 'gendesk' 'git')
+provides=('opsu-git')
+conflicts=('opsu-git')
+source=( ${pkgname}::git://github.com/itdelatrisu/opsu.git
+         pom.patch
+         opsu-git.sh )
+sha512sums=('SKIP'
+            '72c56c8f0c647fcdbf85a32e7c4bf1a37b7176015f08402dc20b707f11c5cbb78be1da81d4a697c9d842ac28a9a0bcf1f4c8252c2a18e2ee35435cd327da683b'
+            '4c8b89b4f273a076620c98058623a0e8c0ab875f191cb65f126e9a0134e0b072ed27ac8a03928225db1b5b9e832935b4efca0db1d7a02b0c8b96ec87748398f3')
+
+pkgver()
+{
+	cd ${srcdir}/${pkgname}
+	git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare()
+{
+	# generate .desktop-file
+	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
+}
+
+build()
+{
+	cd ${srcdir}/${pkgname}
+	mvn install -Djar
+}
+
+package()
+{
+	# cut pkgver
+	_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}
+}
diff --git a/opsu-git.sh b/opsu-git.sh
new file mode 100644
index 000000000000..2e94f9f8a090
--- /dev/null
+++ b/opsu-git.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/java -jar '/usr/share/java/opsu-git/opsu-git.jar' "$@"
diff --git a/pom.patch b/pom.patch
new file mode 100644
index 000000000000..d59c961965e4
--- /dev/null
+++ b/pom.patch
@@ -0,0 +1,12 @@
+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>