From c65e2abfb04ba899f65a908db39c565f97c28b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 5 Oct 2020 07:27:03 +0700 Subject: [PATCH] OpenRCT2: merge OpenRCT2-data --- srcpkgs/OpenRCT2-data | 1 - srcpkgs/OpenRCT2/template | 13 +++---------- 2 files changed, 3 insertions(+), 11 deletions(-) delete mode 120000 srcpkgs/OpenRCT2-data diff --git a/srcpkgs/OpenRCT2-data b/srcpkgs/OpenRCT2-data deleted file mode 120000 index e287e3d44a..0000000000 --- a/srcpkgs/OpenRCT2-data +++ /dev/null @@ -1 +0,0 @@ -OpenRCT2 \ No newline at end of file diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template index 5b0c68a5f8..a6e9d10f5b 100644 --- a/srcpkgs/OpenRCT2/template +++ b/srcpkgs/OpenRCT2/template @@ -5,14 +5,13 @@ pkgname=OpenRCT2 _objects_version=1.0.15 _titles_version=0.1.2 version=0.2.6 -revision=2 +revision=3 build_style=cmake configure_args="$(vopt_if multiplayer "" "-DDISABLE_HTTP_TWITCH=1 -DDISABLE_NETWORK=1")" hostmakedepends="pkg-config unzip" makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel $(vopt_if multiplayer libcurl-devel) $(vopt_if multiplayer libressl-devel)" -depends="OpenRCT2-data" short_desc="Open source re-implementation of RollerCoaster Tycoon 2" maintainer="klardotsh " license="GPL-3.0-or-later" @@ -25,6 +24,8 @@ checksum="0e05a709d3e07343cd72e4db4cb4f1a6d9956f8acf7da682d2a3940c3112776e dcb1648739b351e857e2d19fed1626bec561d5e9f4b49201568f42c475ee7e61" skip_extraction="objects.zip title-sequence-v${_titles_version}.zip" +replaces="OpenRCT2-data>=0" + build_options="multiplayer" build_options_default="multiplayer" desc_option_multiplayer="Enable multiplayer support" @@ -50,11 +51,3 @@ post_extract() { unzip -qd data/object "${_srcdir}/objects.zip" unzip -qd data/title "${_srcdir}/title-sequence-v${_titles_version}.zip" } - -OpenRCT2-data_package() { - short_desc+=" - data files" - archs=noarch - pkg_install() { - vmove usr/share/openrct2 - } -}