diff --git a/app-misc/vrms-gentoo/vrms-gentoo-9999.ebuild b/app-misc/vrms-gentoo/vrms-gentoo-9999.ebuild deleted file mode 100644 index 6490c25ce4..0000000000 --- a/app-misc/vrms-gentoo/vrms-gentoo-9999.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit git-r3 - -DESCRIPTION="vrms clone for Gentoo Linux" -HOMEPAGE="https://github.com/z411/vrms-gentoo" -EGIT_REPO_URI="https://github.com/z411/${PN}.git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" - -DEPEND="" -RDEPEND=" - dev-lang/perl -" - -src_install() { - default - - dobin "${PN}" -} diff --git a/dev-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild b/dev-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild index 81534f476e..67bc0cd2d4 100644 --- a/dev-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild +++ b/dev-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild @@ -24,6 +24,7 @@ DEPEND=" " BDEPEND=" $(vala_depend) + dev-util/gdbus-codegen dev-util/glib-utils doc? ( dev-util/gdbus-codegen diff --git a/dev-libs/libnodave/Manifest b/dev-libs/libnodave/Manifest new file mode 100644 index 0000000000..95ead90e58 --- /dev/null +++ b/dev-libs/libnodave/Manifest @@ -0,0 +1 @@ +DIST libnodave-0.8.5.1.tar.gz 3869449 BLAKE2B e3f9cc0c271d61e28d2f985181751da862f1235166ea82742b357528a896940891e420ca02c2abfcb8dc2a886e8086df3f27ca1765914f3402bfda618eda9a37 SHA512 0e226a3d3256076d6c32930e7be07f0fc62beac797e143bf871d876c172c2d2ff3a3e66e8c2a978fd4caee006e9b736f9633922a9f46728d96f70b07a395ff55 diff --git a/dev-libs/libnodave/files/makefile-0.8.5.1.patch b/dev-libs/libnodave/files/makefile-0.8.5.1.patch new file mode 100644 index 0000000000..467cc13cbe --- /dev/null +++ b/dev-libs/libnodave/files/makefile-0.8.5.1.patch @@ -0,0 +1,111 @@ +--- a/Makefile ++++ b/Makefile +@@ -13,7 +13,7 @@ + # To test with g++ which does stricter type checking: + # + ##CC=g++ +-CFLAGS=-Wall -Winline -DLINUX -DDAVE_LITTLE_ENDIAN ++CFLAGS+=-fPIC -Wall -Winline -DLINUX -DDAVE_LITTLE_ENDIAN + CTFLAGS=-Wall -Winline -fPID -DLINUX -DDAVE_LITTLE_ENDIAN + CPPFLAGS=-Wall -Winline -DLINUX -DDAVE_LITTLE_ENDIAN + # +@@ -73,71 +73,71 @@ + testNLpro.o: benchmark.c nodavesimple.h + + testISO_TCP: nodave.o openSocket.o testISO_TCP.o +- $(CC) $(LDFLAGS) nodave.o openSocket.o testISO_TCP.o -o testISO_TCP ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o openSocket.o testISO_TCP.o -o testISO_TCP + testISO2: nodave.o openSocket.o testISO2.o +- $(CC) $(LDFLAGS) nodave.o openSocket.o testISO2.o -o testISO2 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o openSocket.o testISO2.o -o testISO2 + testISO_TCPd: nodave.o openSocket.o testISO_TCP.o +- $(CC) -lnodave testISO_TCP.o -o testISO_TCPd ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testISO_TCP.o -o testISO_TCPd -lnodave + testPPIload: nodave.o setport.o testPPIload.o +- $(CC) $(LDFLAGS) nodave.o setport.o testPPIload.o -o testPPIload ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o setport.o testPPIload.o -o testPPIload + testMPI: setport.o testMPI.o nodave.o +- $(CC) $(LDFLAGS) setport.o nodave.o testMPI.o -o testMPI ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE setport.o nodave.o testMPI.o -o testMPI + testMPImin: setport.o testMPImin.o nodave.o +- $(CC) $(LDFLAGS) setport.o nodave.o testMPImin.o -o testMPImin ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE setport.o nodave.o testMPImin.o -o testMPImin + testMPId: setport.o testMPI.o nodave.o +- $(CC) -lnodave testMPI.o -o testMPId ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testMPI.o -o testMPId -lnodave + testMPIload: nodave.o setport.o testMPIload.o +- $(CC) $(LDFLAGS) nodave.o setport.o testMPIload.o -o testMPIload ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o setport.o testMPIload.o -o testMPIload + testMPI_IBHload: nodave.o openSocket.o testMPI_IBHload.o +- $(CC) $(LDFLAGS) nodave.o openSocket.o testMPI_IBHload.o -o testMPI_IBHload ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o openSocket.o testMPI_IBHload.o -o testMPI_IBHload + testPPI: nodave.o setport.o testPPI.o +- $(CC) $(LDFLAGS) nodave.o setport.o testPPI.o -o testPPI ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o setport.o testPPI.o -o testPPI + testPPId: nodave.o setport.o testPPI.o +- $(CC) -lnodave testPPI.o -o testPPId ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testPPI.o -o testPPId -lnodave + testISO_TCPload: nodave.o openSocket.o testISO_TCPload.o +- $(CC) $(LDFLAGS) nodave.o openSocket.o testISO_TCPload.o -o testISO_TCPload ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o openSocket.o testISO_TCPload.o -o testISO_TCPload + testIBH: openSocket.o testIBH.o nodave.o +- $(CC) $(LDFLAGS) openSocket.o nodave.o testIBH.o -o testIBH ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE openSocket.o nodave.o testIBH.o -o testIBH + testPPI_IBH: openSocket.o testPPI_IBH.o nodave.o +- $(CC) $(LDFLAGS) openSocket.o nodave.o testPPI_IBH.o -o testPPI_IBH ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE openSocket.o nodave.o testPPI_IBH.o -o testPPI_IBH + testPPI_IBHload: openSocket.o testPPI_IBHload.o nodave.o +- $(CC) $(LDFLAGS) openSocket.o nodave.o testPPI_IBHload.o -o testPPI_IBHload ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE openSocket.o nodave.o testPPI_IBHload.o -o testPPI_IBHload + testPPIcpp: nodave.o setport.o testPPIcpp.o +- $(CC) $(LDFLAGS) nodave.o setport.o testPPIcpp.o -o testPPIcpp ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o setport.o testPPIcpp.o -o testPPIcpp + testMPI2: setport.o testMPI2.o nodave.o nodaveext.o +- $(CC) $(LDFLAGS) setport.o nodave.o nodaveext.o testMPI2.o -o testMPI2 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE setport.o nodave.o nodaveext.o testMPI2.o -o testMPI2 + testAS511: setport.o testAS511.o nodave.o +- $(CC) $(LDFLAGS) setport.o nodave.o testAS511.o -o testAS511 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE setport.o nodave.o testAS511.o -o testAS511 + testUSB: testUSB.o nodave.o usbGlue.o usbGlue.h +- $(CC) $(LDFLAGS) nodave.o testUSB.o usbGlue.o -lusb -o testUSB ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o testUSB.o usbGlue.o -lusb -o testUSB + testNLpro: openSocket.o testNLpro.o nodave.o +- $(CC) $(LDFLAGS) openSocket.o nodave.o testNLpro.o -o testNLpro ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE openSocket.o nodave.o testNLpro.o -o testNLpro + crc: crc.o +- $(CC) $(LDFLAGS) crc.o -o crc ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE crc.o -o crc + crc3: crc3.o +- $(CC) $(LDFLAGS) crc3.o -o crc3 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE crc3.o -o crc3 + testHTTP: nodave.o openSocket.o testHTTP.o +- $(CC) $(LDFLAGS) nodave.o openSocket.o testHTTP.o -o testHTTP ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o openSocket.o testHTTP.o -o testHTTP + ibhsim9.o: simProperties2.c blocklist.h + ibhsim9: ibhsim9.o nodave.h nodave.o openSocket.o openSocket.h blocklist.o blocklist2.o setport.o +- $(CC) -lpthread ibhsim9.o openSocket.o nodave.o blocklist.o blocklist2.o setport.o -o ibhsim9 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lpthread ibhsim9.o openSocket.o nodave.o blocklist.o blocklist2.o setport.o -o ibhsim9 + ibhsim10.o: simProperties2.c blocklist.h + ibhsim10: ibhsim10.o nodave.h nodave.o openSocket.o openSocket.h blocklist.o blocklist2.o setport.o emulator.o +- $(CC) -lm -lpthread ibhsim10.o openSocket.o nodave.o blocklist.o blocklist2.o setport.o emulator.o -o ibhsim10 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lm -lpthread ibhsim10.o openSocket.o nodave.o blocklist.o blocklist2.o setport.o emulator.o -o ibhsim10 + + + + libnodave.so: nodave.o setport.o openSocket.o +- $(LD) -shared nodave.o setport.o openSocket.o -o libnodave.so ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared nodave.o setport.o openSocket.o -Wl,-soname,libnodave.so.0 -o libnodave.so.0 + + # + # for some reason, -lpthread now has to be at the end of the linker command line...05/17/2013 + # + ibhsim5.o: simProperties.c + ibhsim5: ibhsim5.o nodave.h nodave.o openSocket.o openSocket.h +- $(CC) ibhsim5.o openSocket.o nodave.o -lpthread -o ibhsim5 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE ibhsim5.o openSocket.o nodave.o -lpthread -o ibhsim5 + isotest4: isotest4.o openSocket.o nodave.o nodave.h +- $(CC) $(LDFLAGS) isotest4.o openSocket.o nodave.o $(LIB) -lpthread -o isotest4 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE isotest4.o openSocket.o nodave.o $(LIB) -lpthread -o isotest4 + + clean: + rm -f $(DYNAMIC_PROGRAMS) diff --git a/dev-libs/libnodave/libnodave-0.8.5.1.ebuild b/dev-libs/libnodave/libnodave-0.8.5.1.ebuild new file mode 100644 index 0000000000..515085a9d3 --- /dev/null +++ b/dev-libs/libnodave/libnodave-0.8.5.1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic perl-module toolchain-funcs + +DESCRIPTION="Connect to and exchange data with Siemens PLCs" +HOMEPAGE="https://sourceforge.net/projects/libnodave" +SRC_URI="mirror://sourceforge/libnodave/libnodave-${PV}.tar.gz" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc perl" + +DEPEND="" +RDEPEND=" + perl? ( dev-lang/perl:= ) +" +BDEPEND="" +PATCHES=( "${FILESDIR}/makefile-${PV}.patch" ) +DOCS=( ChangeLog readme faq.txt FAQ.de.txt ) + +src_prepare() { + sed -e "s|-I.|-I. -I..|g" -i PERL/Makefile.PL || die + default +} + +src_configure() { + if use perl; then + cd "${S}/PERL" || die + perl-module_src_configure + fi + return +} + +src_compile() { + append-cflags "-L${S}" + emake clean + emake CC="$(tc-getCC)" + ln -s libnodave.so.0 libnodave.so || die +# emake CC="$(tc-getCC)" dynamic + + if use perl; then + cd "${S}/PERL" || die + perl-module_src_compile + fi +} + +src_install() { + dolib.so libnodave.so.0 libnodave.so + doheader nodave.h + use doc && HTML_DOCS=( doc/*.html ) + einstalldocs + + if use perl; then + cd "${S}/PERL" || die + perl-module_src_install + fi +} diff --git a/dev-libs/libnodave/metadata.xml b/dev-libs/libnodave/metadata.xml new file mode 100644 index 0000000000..2dd6b1c94a --- /dev/null +++ b/dev-libs/libnodave/metadata.xml @@ -0,0 +1,12 @@ + + + + + lssndrbarbieri@gmail.com + Alessandro Barbieri + + + https://sourceforge.net/p/libnodave/bugs/ + libnodave + + \ No newline at end of file diff --git a/dev-python/libusb1/libusb1-1.9.1.ebuild b/dev-python/libusb1/libusb1-1.9.1.ebuild index 7eb10df108..5a65f4538f 100644 --- a/dev-python/libusb1/libusb1-1.9.1.ebuild +++ b/dev-python/libusb1/libusb1-1.9.1.ebuild @@ -16,9 +16,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND="virtual/libusb" -BDEPEND=" - dev-python/pip[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] -" +DEPEND="dev-python/wheel[${PYTHON_USEDEP}]" distutils_enable_tests setup.py diff --git a/dev-python/pystray/pystray-0.17.2.ebuild b/dev-python/pystray/pystray-0.17.2.ebuild index 70935466bc..41711222e4 100644 --- a/dev-python/pystray/pystray-0.17.2.ebuild +++ b/dev-python/pystray/pystray-0.17.2.ebuild @@ -20,4 +20,4 @@ RDEPEND=" ${DEPEND} dev-python/python-xlib[${PYTHON_USEDEP}] " -BDEPEND="dev-python/pip[${PYTHON_USEDEP}]" +DEPEND="dev-python/pillow[${PYTHON_USEDEP}]" diff --git a/games-action/netrek-cow/netrek-cow-3.3.2.ebuild b/games-action/netrek-cow/netrek-cow-3.3.2.ebuild index 6be3c33ac2..0617861f22 100644 --- a/games-action/netrek-cow/netrek-cow-3.3.2.ebuild +++ b/games-action/netrek-cow/netrek-cow-3.3.2.ebuild @@ -18,6 +18,7 @@ S="${WORKDIR}/netrek-client-cow-${PV}" RESTRICT="test" RDEPEND=" + media-libs/imlib2 media-libs/libsdl media-libs/sdl-mixer x11-base/xorg-proto diff --git a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild index a75f262064..32440b6e02 100644 --- a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild +++ b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild @@ -21,7 +21,7 @@ RESTRICT="test" DEPEND=" media-libs/libsdl - media-libs/sdl-image + media-libs/sdl-image[tiff] media-libs/freetype media-libs/libpng ttf? ( media-libs/sdl-ttf ) diff --git a/media-gfx/grafx2/grafx2-2.7.2978.ebuild b/media-gfx/grafx2/grafx2-2.7.2978.ebuild index ac53ecd119..574d98c6f8 100644 --- a/media-gfx/grafx2/grafx2-2.7.2978.ebuild +++ b/media-gfx/grafx2/grafx2-2.7.2978.ebuild @@ -23,7 +23,7 @@ PATCHES=( DEPEND=" media-libs/libsdl - media-libs/sdl-image + media-libs/sdl-image[tiff] media-libs/freetype media-libs/libpng ttf? ( media-libs/sdl-ttf ) diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest index 26ae47c1db..24db624ce6 100644 --- a/media-libs/amdvlk/Manifest +++ b/media-libs/amdvlk/Manifest @@ -1,8 +1,13 @@ DIST AMDVLK-v-2020.Q4.5.tar.gz 32258 BLAKE2B e2acdbb87c0a53b45cbbceeda0b7a6432db5713891dc35d9c3c3932e20799fe0ab219de9f2d042ebd403c1904c5a1b0bdf23f8d1a033b7c6d7a17e7c65132373 SHA512 98158c82c08657d130d462f1e5e70f6c77749eb0f139c3b392984c1b44eed0828aab71c580747799a734fa0d581720c5b70779c4c5f5bd3dc269b128df95cec8 +DIST AMDVLK-v-2020.Q4.6.tar.gz 32275 BLAKE2B f7bb0e5df49df9fe5d0a2f5bb169a2fdec7c36548f53c5bd23702465373a754aa43659a2fc7c4b57882ffe64be4438911dcda3766cba26d5a9c08a4e5816e66f SHA512 be8b28ef15e9e7941c97296342393a645095617b96f189939be3885f1e430d7ee683868ec0b1aa6c9642f2572aa066f638b3f770bc425dcb5b284dbf655b32f3 DIST CWPack-7387247eb9889ddcabbc1053b9c2052e253b088e.tar.gz 24538 BLAKE2B 76c4da32ea06df355f7e8f77a14c185b2ccab2ce2762988f04a04d65b674e089d4fc27206e744f89b4bd84c9d7226d324414a31941303290e7f574e9d64756cf SHA512 38378ef325e42a7356511c2fc06b6c896581968079e85c4b924a1768d895feecaf1eb8fd65afb59bed0f66e0547104d67c2deb9f82a86f4b9fa65b36e57cd47d DIST MetroHash-3c566dd9cda44ca7fd97659e0b53ac953f9037d2.tar.gz 11804 BLAKE2B 683ca8a9e4b93a945dc455c5cb78a2c6dd9dbdf22432ea9f447a6d2d1b05399cc57b621d1e304dc5695ab936a212a2df110e47ec9141764f4eaa2b184a01f4ba SHA512 ae4fcf09a097ceddfcc9f0b721cae0018fff8a0360d8fbbb195d2a8c2809cf8f3c01090ba8129593d89fe1c041224e42a49e7a1c66f20e60958a5373f6d9027f DIST llpc-38dcb76aadf729b67cabe15c2cc07a784020f704.tar.gz 2079177 BLAKE2B eb3f594b195af82faeeb9e9f5d73cc294d8178d7390183c083b4231f17a8382f0e72480f3e883b7d3e3b1f7a654974efd4d2dec1c60f6d9ae019696f467f296a SHA512 599ea375fc87621d0085bc9a1d68f00bbde42408c1b9f745ea7da8658c041cdc24722b763e53981a2ad844efa042348be7df939cee4459503ab66d462403ce32 +DIST llpc-e2d38b0c8042efbc435e51696aba5c1abd256c88.tar.gz 2091062 BLAKE2B 64dbba4f1a9c1739e56015b149143ece3795022f81eb28cb05930a1b86e505789d474ab5e6483e9700f3dba07d30a21591417564e630b2fc0e4827ab7f61a0e3 SHA512 04c3f12e6c89cae9b44703bca545e824e9f6ccb6bd88d3be80efe5edc29956fa3b8368bf79f026a691f916567f12643cf7f38a09265db656457d34600a7fe6e6 DIST llvm-project-7ff363c8283c1d41ecbdcdc45c8b724b52312d67.tar.gz 128585110 BLAKE2B 2902b68f08f6a978a08061a145e93d0cbea57e4c47431b0249a06ae986e739d9fbb749b2e59996abcc25834cff59ab2dc837debc7acc7ee12c3ec488cb300cab SHA512 b8e4a6858f1c4ffb26206e545095e64641fef4cee47188d5481d14780f6b8276f70b5c485da1fc26025ee42b6b984c2901caf85ade1599f1a6aa73e0ab190087 +DIST llvm-project-a0777f49050191c9e215a4880c855395ba805508.tar.gz 129045563 BLAKE2B 1234834158b43c7609037cf8eadbc2564dd432eae476f6993383c48164dc4718f450616c35fbddd451a01382ad633c2980c81d27c57b1275dd72a7afc22fe437 SHA512 952843621edfa2f60c08f4c934091acfaed50463f59c24e18821a0023f383840a7346d250e56d1df3ac40fb573957357d4f61f155a2e747508b3748ceaa4df25 DIST pal-b1e752d402592628f61eb7e1aa2a802a205de798.tar.gz 8029839 BLAKE2B 776b85c0d5780a3b6a5a50d04609a20f1552a0afa0caff090013c2506bc9f97592b42f69941ac29697f3dced45e4619ca8be918e1b68fabd5c651893ba689d35 SHA512 5d98bcf1631d70620bb56a380c7b510f6f517d48e1cc0b2f7007687b929fc36af69d7478984756bf84e2f7e6934034c10f7bfce24b83df812de93e3a6b9b9faa +DIST pal-f92844ecbba39be3d2663717ad69c3dffc282211.tar.gz 8049042 BLAKE2B a11b40deb3d9645b88861f9bb3ed198fab07baace72ee5c9566601d71b0cda94178161ea59d4ba09384b3c9f88fb40a956243aacbc5ccc3e1b6b58bc053ab98f SHA512 bc2bcfbfc6d1d39ae3ed0f409e9708c9ef7fe01c83d4941f68f3afd4936c014b143a82c65c4d59714c24d85c8dde4338de426ad3b48d68fb4077d0d08382a33c DIST spvgen-fb798cb760a436e9496dbaab8827e4d183b74744.tar.gz 19475 BLAKE2B ace1afe0f9b129fdf3079341a09f0e761b1604a415412a3ea33325e770cecb62e67945a5d83b3248a29222b2dca86ad63c4c7d89e250851edc37d22543e75f20 SHA512 2c4f72518e6f1fbefebfe51d6e7d14187bad99b036b26f131ed726d0525244b33017549f5a56a4f7770239eaa411ff93561be53072458c6f491452ae496ee156 +DIST xgl-86f61a31988a626371131a1633547b0d0ebfcfcb.tar.gz 818497 BLAKE2B 17973a57d15c96568107f6b27096f275a59405c97465f7788876282d1082e1d30f20a48b8a2c83553ec5ff0a7ba36c8a89885596386a8788192ed4a476035554 SHA512 028336666bc83a9df29b090852cfd1781a4dca70b477d8ddeb29e2347f01ff50c457f2da3ea9ad8880e6223451543cd8d695bd99108e2240b63e3b176a120536 DIST xgl-fc11e79aab63337702d8efc05e5433dec9efdf06.tar.gz 810567 BLAKE2B 452a9264df787d42f18618e8d49cad9fb79f4a6ece505d238f5a09652505886555db892c8c6f4f6139c28cf7db6efc387330f101e32c1262f00fc5c6e1c17e74 SHA512 db50fcdac279eb17b977f47ca66397c7194d021dd4db9b4e34e4a0eccb6fdbda5222a57c306ac8fba8eec2986703596a5cb1b2130d8a1bcf81c30f69be0f2808 diff --git a/media-libs/amdvlk/amdvlk-2020.4.6.ebuild b/media-libs/amdvlk/amdvlk-2020.4.6.ebuild new file mode 100644 index 0000000000..f89845675e --- /dev/null +++ b/media-libs/amdvlk/amdvlk-2020.4.6.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MULTILIB_COMPAT=( abi_x86_{32,64} ) + +inherit multilib-minimal check-reqs + +#inherit cmake-multilib and cmake-utils build doesn't support https://github.com/GPUOpen-Drivers/AMDVLK/issues/151 +DESCRIPTION="AMD Open Source Driver for Vulkan" +HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug wayland" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" +###DEPENDS +BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]" +DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) + ${BUNDLED_LLVM_DEPEND} + >=dev-util/vulkan-headers-1.2.162" +BDEPEND="${BUNDLED_LLVM_DEPEND} + dev-util/cmake" +RDEPEND=" ${DEPEND} + x11-libs/libdrm[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-libs/libxcb[${MULTILIB_USEDEP}] + x11-libs/libxshmfence[${MULTILIB_USEDEP}] + >=media-libs/vulkan-loader-1.2.162[${MULTILIB_USEDEP}]" + +CHECKREQS_MEMORY="4G" +CHECKREQS_DISK_BUILD="2G" +S="${WORKDIR}" +CMAKE_USE_DIR="${S}/xgl" + +###SOURCE CODE VARIABLES +FETCH_URI="https://github.com/GPUOpen-Drivers" +CORRECT_AMDVLK_PV="v-$(ver_rs 1 '.Q')" #Works only for amdvlk source code: transforming version 2019.2.2 to v-2019.Q2.2. Any other commits should be updated manually +##For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/master/default.xml +##and place commits in the desired variables +## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07" +## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..." +XGL_COMMIT="86f61a31988a626371131a1633547b0d0ebfcfcb" +PAL_COMMIT="f92844ecbba39be3d2663717ad69c3dffc282211" +LLPC_COMMIT="e2d38b0c8042efbc435e51696aba5c1abd256c88" +SPVGEN_COMMIT="fb798cb760a436e9496dbaab8827e4d183b74744" +LLVM_PROJECT_COMMIT="a0777f49050191c9e215a4880c855395ba805508" +METROHASH_COMMIT="3c566dd9cda44ca7fd97659e0b53ac953f9037d2" +CWPACK_COMMIT="7387247eb9889ddcabbc1053b9c2052e253b088e" +## SRC_URI +SRC_URI=" ${FETCH_URI}/AMDVLK/archive/${CORRECT_AMDVLK_PV}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}.tar.gz +${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> xgl-${XGL_COMMIT}.tar.gz +${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> pal-${PAL_COMMIT}.tar.gz +${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> llpc-${LLPC_COMMIT}.tar.gz +${FETCH_URI}/spvgen/archive/${SPVGEN_COMMIT}.tar.gz -> spvgen-${SPVGEN_COMMIT}.tar.gz +${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz +${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> MetroHash-${METROHASH_COMMIT}.tar.gz +${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> CWPack-${CWPACK_COMMIT}.tar.gz" + +###EBUILD FUNCTIONS +src_prepare() { + ##moving src to proper directories + mkdir -p "${S}" + mkdir -p "${S}/third_party" + mv AMDVLK-${CORRECT_AMDVLK_PV}/ "${S}/AMDVLK" + mv xgl-${XGL_COMMIT}/ "${S}/xgl" + mv pal-${PAL_COMMIT}/ "${S}/pal" + mv llpc-${LLPC_COMMIT}/ "${S}/llpc" + mv spvgen-${SPVGEN_COMMIT}/ "${S}/spvgen" + mv llvm-project-${LLVM_PROJECT_COMMIT}/ "${S}/llvm-project" + mv MetroHash-${METROHASH_COMMIT}/ "${S}/third_party/metrohash" + mv CWPack-${CWPACK_COMMIT}/ "${S}/third_party/cwpack" + cd "${S}/xgl" + default +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_WAYLAND_SUPPORT=$(usex wayland ) + -DCMAKE_BUILD_TYPE="$(usex debug "Debug" "Release")" + -B"${BUILD_DIR}" ) + cd "${S}"/xgl + cmake -H. "${mycmakeargs[@]}" +} + +multilib_src_install() { + if use abi_x86_64 && multilib_is_native_abi; then + mkdir -p "${D}/usr/lib64/" + mv "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/" + insinto /usr/share/vulkan/icd.d + doins "${S}/AMDVLK/json/Redhat/amd_icd64.json" + else + mkdir -p "${D}/usr/lib/" + mv "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/" + insinto /usr/share/vulkan/icd.d + doins "${S}/AMDVLK/json/Redhat/amd_icd32.json" + fi +} + +pkg_postinst() { + elog "More information about the configuration can be found here:" + elog " https://github.com/GPUOpen-Drivers/AMDVLK" + ewarn "Make sure the following line is NOT included in the any Xorg configuration section:" + ewarn "| Driver \"modesetting\"" + ewarn "and make sure you use DRI3 mode for Xorg (not revelant for wayland)" + ewarn "Else AMDVLK breaks things" + ewarn "With some games AMDVLK is still not stable. Use it at you own risk" + elog "You may want to disable default vulkan mesa provider in package.use \"media-libs/mesa -vulkan\"" + elog "or perform export in /etc/env.d/ variable VK_ICD_FILENAMES=vulkanprovidername:vulkanprovidername2 " + elog "exampe| VK_ICD_FILENAMES=\"/usr/share/vulkan/icd.d/amd_icd64.json:/usr/share/vulkan/icd.d/amd_icd64.json\"" + elog "For DXVK: use DXVK_FILTER_DEVICE_NAME= variable" +} diff --git a/media-sound/ibniz/ibniz-1.18.ebuild b/media-sound/ibniz/ibniz-1.18.ebuild index 709c52d287..5c80dc61eb 100644 --- a/media-sound/ibniz/ibniz-1.18.ebuild +++ b/media-sound/ibniz/ibniz-1.18.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit toolchain-funcs + DESCRIPTION="virtual machine designed for extremely compact low-level audiovisual programs" HOMEPAGE="http://pelulamu.net/ibniz/" SRC_URI="http://pelulamu.net/ibniz/${P}.tar.gz" @@ -10,11 +12,18 @@ SRC_URI="http://pelulamu.net/ibniz/${P}.tar.gz" LICENSE="ZLIB" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="media-libs/libsdl" +DEPEND="media-libs/libsdl[X]" RDEPEND="${DEPEND}" +src_prepare() { + default + sed -e "s/gcc/$(tc-getCC)/" \ + -e "s/FLAGS=/FLAGS=${CFLAGS} /" \ + -e "s/-s //" \ + -i Makefile +} + src_install() { dobin ibniz }