Merge remote-tracking branch 'upstream/master'

This commit is contained in:
hedmo 2020-05-19 18:31:46 +02:00
commit 94048f2952
14 changed files with 290 additions and 140 deletions

View File

@ -1 +0,0 @@
DIST fuzzylite-6.0.tar.gz 2189181 BLAKE2B 14162c08d5f9bbc94739b575fbbe9dad3da73d30c479be02c474e18af7de78f5b200ae00e40977c9075445e252faa803521715c67049ad10fcaa907b847551cc SHA512 6f5d40d0359458e109ac2aebfbf571f61867a8b49920f4a5e1b5d86bdf578dba038b942c9e05eab0d4620f73e8cded770abe7b5e597a3b4c39dbcf6a1259f4af

View File

@ -1,31 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake-utils
DESCRIPTION="A fuzzy logic control library in C++"
HOMEPAGE="https://fuzzylite.com/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="static"
RDEPEND="!!<games-strategy/vcmi-0.99_p20191103"
S="${S}/${PN}"
src_prepare() {
sed -i -e 's/-Werror//g' CMakeLists.txt || die
cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
-DFL_BUILD_STATIC=$(usex static)
)
cmake-utils_src_configure
}

View File

@ -0,0 +1,3 @@
DIST darkplacesengine20170829beta1.zip 29103945 BLAKE2B e6ddcb5a9f3a820879a70ca4578867f80a1df5e2143f20f924eb93b75cf9beafb74246dcca15cd3328e61189ff431fe678fc5a70f17d32dfa978499e8a1d0127 SHA512 49ec750199240eb7ba4eae6ede3a3ee85bafef07607b827111fb7846f7283c44a480637a45fd85a33f441ab2f99c44dc105348ea5da04d0397650f1a347cf3e9
DIST fuhquake-lits.rar 8388829 BLAKE2B fb9c4db151deb43424de9331641154f412394ae6346864bc62a210c7d8d12c6ed6c8647cb4cd83fa853155c5f562f7e9b8d3c779fe74c1bb3f05bb6f627b1d5e SHA512 6e59f5e08a6c401b329b86b0cd677a04b1a5aee11f24973c77c9e7ea50cab9dedf4fc15c4f3d6b73bdc87bacdc9612a3c244d0a4ceceef943abb6e256ac23925
DIST id1.pk3 350470 BLAKE2B 76426667de5f42633f608b75286671344d439398aa9b819e9ba3979ca317a93930b1077de7efb4b1bad670a6341c7536d572cfc2590a5812c71dd0c4e8def784 SHA512 d4d7233bc1e5049e89d09448818219b0ce7941fecde5381cd95933e4c96ebc9b4e34ff7eae5eb5d0d1e3cc2ceb4f5254f4d600aded7dda373713149817621331

View File

@ -0,0 +1,189 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit eutils flag-o-matic unpacker desktop
# Latest versions are in http://icculus.org/twilight/darkplaces/files/
MY_PV="${PV/_beta/beta}"
MY_ENGINE="${PN}engine${MY_PV}.zip"
# Different Quake 1 engines expect the lights in different directories
# http://www.fuhquake.net/download.html and http://www.kgbsyndicate.com/romi/
MY_LIGHTS="fuhquake-lits.rar"
DESCRIPTION="Enhanced engine for iD Software's Quake 1"
HOMEPAGE="http://icculus.org/twilight/darkplaces/"
SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE}
lights? (
http://www.fuhquake.net/files/extras/${MY_LIGHTS}
http://www.kgbsyndicate.com/romi/id1.pk3 )"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="alsa cdinstall cdsound debug dedicated demo lights opengl oss sdl textures"
UIRDEPEND="
virtual/jpeg:0
media-libs/libogg
media-libs/libvorbis
virtual/opengl
alsa? ( media-libs/alsa-lib )
sdl? ( media-libs/libsdl )
x11-libs/libX11
x11-libs/libXpm
x11-libs/libXxf86dga
x11-libs/libXxf86vm
"
UIDEPEND="
x11-base/xorg-proto
"
RDEPEND="
net-misc/curl
cdinstall? ( games-fps/quake1-data )
demo? ( games-fps/quake1-demodata )
textures? ( >=games-fps/quake1-textures-20050820 )
opengl? ( ${UIRDEPEND} )
!opengl? ( sdl? ( ${UIRDEPEND} ) )
!opengl? ( !sdl? ( !dedicated? ( ${UIRDEPEND} ) ) )
"
DEPEND="lights? ( || (
app-arch/unrar
app-arch/rar ) )
opengl? (
${UIRDEPEND}
${UIDEPEND} )
!opengl? ( sdl? (
${UIRDEPEND}
${UIDEPEND} ) )
!opengl? ( !sdl? ( !dedicated? (
${UIRDEPEND}
${UIDEPEND} ) ) )
virtual/pkgconfig
app-arch/unzip
"
S="${WORKDIR}/${PN}"
dir="/usr/share/quake1"
opengl_client() { use opengl || ( ! use dedicated && ! use sdl ) }
src_unpack() {
if use lights ; then
unpack "${MY_LIGHTS}"
unpack_zip "${DISTDIR}"/id1.pk3
mv *.lit maps/ || die
mv ReadMe.txt rtlights.txt
fi
unpack "${MY_ENGINE}"
unpack ./${PN}*.zip
}
src_prepare() {
default
rm "${WORKDIR}"/README-SDL.txt
cd "${S}"
rm mingw_note.txt
strip-flags
# Only additional CFLAGS optimization is the -march flag
local march=$(get-flag -march)
sed -i \
-e "s:-lasound:$(pkg-config --libs alsa):" \
-e "/^CPUOPTIMIZATIONS/d" \
-e '/^OPTIM_RELEASE/s/=.*/=$(CFLAGS)/' \
-e '/^OPTIM_DEBUG/s/=.*/=$(CFLAGS)/' \
-e '/^LDFLAGS_DEBUG/s/$/ $(LDFLAGS)/' \
-e '/^LDFLAGS_RELEASE/s/$/ $(LDFLAGS)/' \
-e "s:strip:true:" \
makefile.inc || die
if ! use cdsound ; then
# Turn the CD accesses off
sed -i \
-e "s:/dev/cdrom:/dev/null:" \
cd_linux.c || die
sed -i \
-e 's:COM_CheckParm("-nocdaudio"):1:' \
cd_shared.c || die
fi
}
src_compile() {
local opts="DP_FS_BASEDIR=\"${dir}\" DP_LINK_TO_LIBJPEG=1"
# Preferred sound is alsa
local sound_api="NULL"
use oss && sound_api="OSS"
use alsa && sound_api="ALSA"
opts="${opts} DP_SOUND_API=${sound_api}"
local type="release"
use debug && type="debug"
# Only compile a maximum of 1 client
if use sdl ; then
emake ${opts} "sdl-${type}"
elif opengl_client ; then
emake ${opts} "cl-${type}"
fi
if use dedicated ; then
emake ${opts} "sv-${type}"
fi
}
src_install() {
if opengl_client || use sdl ; then
local type=glx
use sdl && type=sdl
# darkplaces executable is needed, even just for demo
newbin "${PN}-${type}" ${PN}
newicon darkplaces72x72.png ${PN}.png
if use demo ; then
# Install command-line for demo, even if not desktop entry
make_wrapper ${PN}-demo "${PN} -game demo"
fi
if use demo && ! use cdinstall ; then
make_desktop_entry ${PN}-demo "Dark Places (Demo)"
else
# Full version takes precedence over demo
make_desktop_entry ${PN} "Dark Places"
fi
fi
if use dedicated ; then
newbin ${PN}-dedicated ${PN}-ded
fi
dodoc *.txt ChangeLog todo "${WORKDIR}"/*.txt
if use lights ; then
insinto "${dir}"/id1
doins -r "${WORKDIR}"/{cubemaps,maps}
if use demo ; then
# Set up symlinks, for the demo levels to include the lights
local d
for d in cubemaps maps ; do
dosym "${dir}/id1/${d}" "${dir}/demo/${d}"
done
fi
fi
}
pkg_postinst() {
if ! use cdinstall && ! use demo ; then
elog "Place pak0.pak and pak1.pak in ${dir}/id1"
fi
if use sdl && ! use alsa ; then
ewarn "Select opengl with alsa, instead of sdl USE flag, for better audio latency."
fi
}

View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>games@gentoo.org</email>
<name>Gentoo Games Project</name>
</maintainer>
<use>
<flag name="cdsound">Enables using CD audio in the engine</flag>
<flag name="demo">Uses the demo data from quake1 (quake1-demodata)</flag>
<flag name="lights">Install and setup the updated light maps</flag>
<flag name="textures">Install and setup the updated textures</flag>
</use>
</pkgmetadata>

View File

@ -0,0 +1,2 @@
DIST Q15_PublicBeta1.7z 412650697 BLAKE2B f9f6ce082ec42d67e0d001b363b25ea53d05d433863e74454420f3f98f64cff7188a700343685ef6d2f3649de703ce52c18144ce982fdf34c8b7aca9bc18bfd2 SHA512 2ae9f2dc3a95331985621bde1d27187c009b66aa807e44125c2a0f019c4e3eada5578ea4cc1ef7aed2844390a4a7eda20c8eedde7d9c084635bf65dbf4908c27
DIST Q15_patch2.7z 4045889 BLAKE2B f5bf7d7dc02758da7dd1969bd748c5861e8d47c102d5d4a823dda979e1404a7264147b477f751d649681fbb015f2d0777a13c09903458b7f92fdd742072b8279 SHA512 07f9a59202c2195af067a789b6075cdcdf2070953faae7460820ddb112a6d5aaec9015ce181ec4e9731280d36d8f13c7c8af63450d66eb7b287b8ed6261b8ba1

View File

@ -1,8 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ykonotopov@gnome.org</email>
<name>Yuri Konotopov</name>
</maintainer>
</pkgmetadata>

View File

@ -0,0 +1,33 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="A mod that makes Quake faster paced, harder, gorier and more violent."
HOMEPAGE="https://www.moddb.com/mods/quake-15"
SRC_URI="
https://www.moddb.com/downloads/mirror/173517/114/5090a373c5249e55e509808983481a04 -> Q15_PublicBeta1.7z
https://www.moddb.com/downloads/mirror/173707/114/f7627345043efdfcd9e27d4906a382ac -> Q15_patch2.7z
"
LICENSE="HPND"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
IUSE=""
RDEPEND=">=games-fps/darkplaces-20170829_beta1"
DEPEND="app-arch/p7zip"
S="${WORKDIR}"
src_install() {
insinto "/usr/share/quake1"
doins -r quake15
}
pkg_postinst() {
echo
elog "In order to play this mod run Quake with -game option:"
elog " darkplaces -game quake15"
echo
}

View File

@ -1 +0,0 @@
DIST vcmi-0.99_p20200314.tar.gz 5660345 BLAKE2B 4d2bea56ba0ec6d03ac40ec24202b84e9039aa1dbdce41874224486a45558803653597b1c09ec6e21bb9b44264488d077f609c1c6e19ee3a6e8500f27c9d697d SHA512 9122b4594bd24899387660fd829910f141e861004ff2907471ede5c4e3bde714869e3fb84e197228e8218814dd825dd7800dc011caa04a64a9f100d40682d0c7

View File

@ -1,22 +0,0 @@
--- a/client/icons/vcmiclient.desktop
+++ b/client/icons/vcmiclient.desktop
@@ -4,7 +4,7 @@ Name=VCMI Client
GenericName=Strategy Game Engine
Comment=Open engine for Heroes of Might and Magic 3
Icon=vcmiclient
-Exec=vcmiclient
+Exec=env LD_LIBRARY_PATH=/usr/lib/vcmi:/usr/lib64/vcmi vcmiclient
Categories=Game;StrategyGame;
Version=1.0
Keywords=heroes;homm3;
--- a/launcher/vcmilauncher.desktop
+++ b/launcher/vcmilauncher.desktop
@@ -4,7 +4,7 @@ Name=VCMI
GenericName=Strategy Game Engine
Comment=Launcher for open engine of Heroes of Might and Magic 3
Icon=vcmiclient
-Exec=vcmilauncher
+Exec=env LD_LIBRARY_PATH=/usr/lib/vcmi:/usr/lib64/vcmi vcmilauncher
Categories=Game;StrategyGame;
Version=1.0
Keywords=heroes;homm3;

View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ykonotopov@gnome.org</email>
<name>Yuri Konotopov</name>
</maintainer>
<use>
<flag name="editor">Enable compilation of map editor</flag>
<flag name="erm">Enable compilation of ERM scripting module</flag>
<flag name="launcher">Enable compilation of launcher</flag>
</use>
</pkgmetadata>

View File

@ -1,68 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
COMMIT_SHA="dca5d86e7a6d18d2ddac7258f98a0ce08c691a6e"
inherit cmake-utils vcs-snapshot xdg
DESCRIPTION="VCMI is work-in-progress attempt to recreate engine for Heroes III."
HOMEPAGE="http://vcmi.eu"
SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT_SHA}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="editor erm +launcher"
RDEPEND="
dev-libs/fuzzylite
media-libs/libsdl2[video]
media-libs/sdl2-image
media-libs/sdl2-mixer[mp3]
media-libs/sdl2-ttf
sys-libs/zlib[minizip]
virtual/ffmpeg
editor? (
dev-qt/qtwidgets:5
)
launcher? (
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
)
"
DEPEND="${RDEPEND}
dev-libs/boost:=[nls]
virtual/pkgconfig
"
src_prepare() {
patch -p1 < "${FILESDIR}"/0001-fix-desktop-entries-not-loading-due-to-missing-libs.patch
cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
-DENABLE_EDITOR=$(usex editor)
-DENABLE_ERM=$(usex erm)
-DENABLE_LAUNCHER=$(usex launcher)
-DENABLE_PCH=ON
-DENABLE_TEST=OFF
-DFORCE_BUNDLED_FL=OFF
)
cmake-utils_src_configure
}
pkg_postinst() {
xdg_pkg_postinst
elog "In order to play VCMI you must install:"
elog "- Heroes III: Shadow of Death or Complete edition;"
elog "- Unnoficial WoG addon;"
elog "- VCMI data files."
elog "Use vcmibuilder tool for automated install of data files;"
elog "Additional information can be found in VCMI wiki:"
elog "http://wiki.vcmi.eu/index.php?title=Installation_on_Linux#Installing_Heroes_III_data_files"
}

View File

@ -1 +1,2 @@
DIST ytmdl-2020.03.21.tar.gz 4913549 BLAKE2B 890d2d674fda0799df5d7a645338cf1fb9b3e14018b3e6ffe0452c8c20a3c9c8ceed3d244917cfa16ea7cb4b56a58399f40273e2fd9f9f1241bb3d377a38a834 SHA512 d47891efb6d977da05679cc5f0f1a4e12d8e2e60dcd015fd23ac6a61cf37a77f1c2e1e9617491bb05bdabc6d5756d861ff9e6a50b08efd0c8317e1328c4fbc46
DIST ytmdl-2020.05.14.tar.gz 350781 BLAKE2B ceaa14bee8805169b4e015a8d2adaca863d0ea75a26b9ab158f05d0f9736326515d33d9202fa9704beb47adcd841c032493bd0bac80acd7b4de1d6f781d0fa9e SHA512 93b43012d7a6c5ac00755f3b748bf6037e314a73ffbe67ff2fc70b6b708e376446103de6f85e4e82984cff321b7c2a99faefa90f3d3c7bd3b01752a69b11fc7f

View File

@ -0,0 +1,48 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1
DESCRIPTION="A simple app to get songs from youtube in mp3 format"
HOMEPAGE="https://github.com/deepjyoti30/ytmdl"
if [[ "${PV}" == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/deepjyoti30/${PN}.git"
KEYWORDS=""
else
SRC_URI="https://github.com/deepjyoti30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
fi
RESTRICT="mirror"
LICENSE="MIT"
SLOT="0"
IUSE=""
src_prepare() {
# Excerpt from https://pypi.org/project/bs4
# "The official name of PyPIs Beautiful Soup Python package is beautifulsoup4.
# This package ensures that if you type pip install bs4 by mistake you will end up with Beautiful Soup."
# ;-)
sed -i 's/bs4/beautifulsoup4/' setup.py
distutils-r1_src_prepare
}
RDEPEND="
>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
dev-python/PySocks[${PYTHON_USEDEP}]
dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
dev-python/colorama[${PYTHON_USEDEP}]
dev-python/ffmpeg-python[${PYTHON_USEDEP}]
dev-python/itunespy[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
media-libs/mutagen[${PYTHON_USEDEP}]
net-misc/downloader-cli[${PYTHON_USEDEP}]
net-misc/youtube-dl[${PYTHON_USEDEP}]
"