diff options
author | Repository QA checks <repo-qa-checks@gentoo.org> | 2018-04-18 19:25:01 +0000 |
---|---|---|
committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2018-04-18 19:25:01 +0000 |
commit | 3155d8edbfbeb4f7ba2244db6d411f2ef1db1981 (patch) | |
tree | 0d80e6574de17622c6333538318b552c28c6de95 /media-libs | |
parent | 2018-04-18 18:20:00 UTC (diff) | |
parent | media-sound/mpfc: Remove old (diff) | |
download | gentoo-3155d8edbfbeb4f7ba2244db6d411f2ef1db1981.tar.gz gentoo-3155d8edbfbeb4f7ba2244db6d411f2ef1db1981.tar.bz2 gentoo-3155d8edbfbeb4f7ba2244db6d411f2ef1db1981.zip |
Merge updates from master
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/libnjb/Manifest | 1 | ||||
-rw-r--r-- | media-libs/libnjb/files/libnjb-2.2.7-exclude-samples.patch | 11 | ||||
-rw-r--r-- | media-libs/libnjb/libnjb-2.2.6.ebuild | 41 | ||||
-rw-r--r-- | media-libs/libnjb/libnjb-2.2.7.ebuild | 19 | ||||
-rw-r--r-- | media-libs/libsdl2/Manifest | 1 | ||||
-rw-r--r-- | media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch | 48 | ||||
-rw-r--r-- | media-libs/libsdl2/files/libsdl2-2.0.5-static-libs.patch | 89 | ||||
-rw-r--r-- | media-libs/libsdl2/libsdl2-2.0.5-r1.ebuild | 158 | ||||
-rw-r--r-- | media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild (renamed from media-libs/libsdl2/libsdl2-2.0.7.ebuild) | 17 | ||||
-rw-r--r-- | media-libs/libsdl2/libsdl2-2.0.8.ebuild | 170 | ||||
-rw-r--r-- | media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild | 4 | ||||
-rw-r--r-- | media-libs/vigra/Manifest | 1 | ||||
-rw-r--r-- | media-libs/vigra/vigra-1.11.1.ebuild | 139 |
13 files changed, 170 insertions, 529 deletions
diff --git a/media-libs/libnjb/Manifest b/media-libs/libnjb/Manifest index 0f20a2858bd9..59dd13c16029 100644 --- a/media-libs/libnjb/Manifest +++ b/media-libs/libnjb/Manifest @@ -1,2 +1 @@ -DIST libnjb-2.2.6.tar.gz 504329 BLAKE2B 6e89b13dbb84fb71f2112ae1523c8b431222d6b4af85a2a7d318653a4a62beca2c5f48efb37475499e78f1d05ecfa5d18be26673f253f343b6886eda52b6e765 SHA512 c079abcf5d2c1fd56dfd6da6a7bf08d1f35e365b6186072f526980a49d8f72cf04c79381eda4fbada5ca467ae6c9e96c6e3a13b753937040530f6e6c61b012f2 DIST libnjb-2.2.7.tar.gz 497862 BLAKE2B e6b7ba77d99f2f4e777ebdca6793d6a348073d9696b9b38b51bc7e29ddacff9a5d19116ca538416ef068496a8827700ed4f740e8ce0c0c1402751c97eb45ed58 SHA512 d217beb772024ec122739327dae9f1e991ace4c3dfe79a4960d1d7421c3d663f924304331025a1790ea7b697ac84d8926f3ab507c6d919e781e90ca82ef6fd06 diff --git a/media-libs/libnjb/files/libnjb-2.2.7-exclude-samples.patch b/media-libs/libnjb/files/libnjb-2.2.7-exclude-samples.patch new file mode 100644 index 000000000000..f241338c2123 --- /dev/null +++ b/media-libs/libnjb/files/libnjb-2.2.7-exclude-samples.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -249,7 +249,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = src sample doc ++SUBDIRS = src doc + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libnjb.pc + EXTRA_DIST = libnjb.pc \ diff --git a/media-libs/libnjb/libnjb-2.2.6.ebuild b/media-libs/libnjb/libnjb-2.2.6.ebuild deleted file mode 100644 index 132f4be4850c..000000000000 --- a/media-libs/libnjb/libnjb-2.2.6.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -inherit libtool multilib udev - -DESCRIPTION="a C library and API for communicating with the Creative Nomad JukeBox digital audio player" -HOMEPAGE="http://libnjb.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" -IUSE="static-libs" - -RDEPEND="virtual/libusb:0" -DEPEND="${RDEPEND}" - -src_prepare() { - sed -i \ - -e 's:SUBDIRS = src sample doc:SUBDIRS = src doc:' \ - Makefile.in || die - - elibtoolize -} - -src_configure() { - econf \ - --disable-dependency-tracking \ - $(use_enable static-libs static) -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc AUTHORS ChangeLog* FAQ HACKING README - - udev_newrules "${FILESDIR}"/${PN}.rules 80-${PN}.rules - - find "${D}" -name '*.la' -exec rm -f {} + -} diff --git a/media-libs/libnjb/libnjb-2.2.7.ebuild b/media-libs/libnjb/libnjb-2.2.7.ebuild index e1285c049c4b..48e23269a9ca 100644 --- a/media-libs/libnjb/libnjb-2.2.7.ebuild +++ b/media-libs/libnjb/libnjb-2.2.7.ebuild @@ -1,29 +1,27 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit libtool multilib udev +EAPI=6 -DESCRIPTION="a C library and API for communicating with the Creative Nomad JukeBox digital audio player" +inherit libtool udev + +DESCRIPTION="Library for communicating with the Creative Nomad JukeBox digital audio player" HOMEPAGE="http://libnjb.sourceforge.net" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd" +KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" IUSE="doc static-libs" RDEPEND="virtual/libusb:0" DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" -DOCS="AUTHORS ChangeLog* FAQ HACKING README" +PATCHES=( "${FILESDIR}"/${P}-exclude-samples.patch ) src_prepare() { - sed -i \ - -e 's:SUBDIRS = src sample doc:SUBDIRS = src doc:' \ - Makefile.in || die - + default elibtoolize } @@ -39,5 +37,6 @@ src_install() { udev_newrules "${FILESDIR}"/${PN}.rules 80-${PN}.rules - find "${ED}" -name '*.la' -exec rm -f {} + + # package provides .pc files + find "${D}" -name '*.la' -delete || die } diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 6d0acba20194..c053b3107aa3 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,4 +1,3 @@ DIST SDL2-2.0.4.tar.gz 4136230 BLAKE2B 374ba4c86f10d07f592dbeb6340b38e1360561fed4fa40d75c763adbfc3dd1605eed6841243ce14597814da5b0a86d7c6d4351198987919a3a7bc4db943f32b7 SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6 DIST SDL2-2.0.5.tar.gz 4209352 BLAKE2B c0a040e39117ac355e49950434a96b790dba2af13116071bdad6e50131b8f62f494463ec5fff5e4aff370733ac226888033ba189e431cc527cb3149076548159 SHA512 6401f5df08c08316c09bc6ac5b28345c5184bb25770baa5c94c0a582ae130ddf73bb736e44bb31f4e427c1ddbbeec4755a6a5f530b6b4c3d0f13ebc78ddc1750 -DIST SDL2-2.0.7.tar.gz 4432499 BLAKE2B 730c6001a11922720975453059602a28116ae046da25cfa3a2b2f29be306b8807cc720f17dff9f0c944d4cbf9c1340a19085b17d23e1e594e7b63b514e736cf1 SHA512 eed5477843086a0e66552eb197a5c4929134522bc366d873732361ea0df5fb841ef7e2b1913e21d1bae69e6fd3152ee630492e615c58cbe903e7d6e47b587410 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869 diff --git a/media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch b/media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch deleted file mode 100644 index 34455663a563..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/joystick/SDL_gamecontrollerdb.h b/src/joystick/SDL_gamecontrollerdb.h -index 1e623cb..ae84c6d 100644 ---- a/src/joystick/SDL_gamecontrollerdb.h -+++ b/src/joystick/SDL_gamecontrollerdb.h -@@ -47,6 +47,8 @@ static const char *s_ControllerMappings [] = - "4c056802000000000000504944564944,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,", - "25090500000000000000504944564944,PS3 DualShock,a:b2,b:b1,back:b9,dpdown:h0.8,dpleft:h0.4,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b0,y:b3,", - "4c05c405000000000000504944564944,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", -+ "4c05cc09000000000000504944564944,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", -+ "4c05a00b000000000000504944564944,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", - #endif - #if defined(__MACOSX__) - "10280000000000000900000000000000,8Bitdo SFC30 GamePad Joystick,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,", -@@ -62,6 +64,10 @@ static const char *s_ControllerMappings [] = - "11010000000000002014000000000000,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b12,x:b2,y:b3,", - "11010000000000001714000000000000,SteelSeries Stratus XL,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b12,x:b2,y:b3,", - "5e040000000000008e02000000000000,X360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,", -+ "030000004c0500006802000000010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,", -+ "030000004c050000c405000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", -+ "030000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", -+ "030000004c050000a00b000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", - #endif - #if defined(__LINUX__) - "05000000102800000900000000010000,8Bitdo SFC30 GamePad,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,", -@@ -85,12 +91,23 @@ static const char *s_ControllerMappings [] = - "03000000550900001072000011010000,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,", - "050000007e0500003003000001000000,Nintendo Wii Remote Pro Controller,a:b1,b:b0,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,", - "050000003620000100000002010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,", -+ "030000004c0500006802000010010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,", -+ "050000004c0500006802000000010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:a12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:a13,rightx:a2,righty:a3,start:b3,x:b15,y:b12,", - "030000004c0500006802000011010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,", -+ "030000004c0500006802000010810000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", -+ "050000004c0500006802000000810000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", -+ "030000004c0500006802000011810000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", - "03000000341a00003608000011010000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", - "030000004c050000c405000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", - "050000004c050000c405000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", - "030000004c050000cc09000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", - "050000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", -+ "030000004c050000a00b000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", -+ "030000004c050000c405000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", -+ "050000004c050000c405000000810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", -+ "030000004c050000cc09000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", -+ "050000004c050000cc09000000810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", -+ "030000004c050000a00b000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", - "03000000c6240000045d000025010000,Razer Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", - "03000000321500000009000011010000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,", - "050000003215000000090000163a0000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,", diff --git a/media-libs/libsdl2/files/libsdl2-2.0.5-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.5-static-libs.patch deleted file mode 100644 index eed72dcccc35..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.0.5-static-libs.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- SDL2-2.0.5/configure.in -+++ SDL2-2.0.5/configure.in -@@ -3197,7 +3197,7 @@ - if test -f /lib/w32api/libuuid.a; then - LIBUUID=/lib/w32api/libuuid.a - else -- LIBUUID=-luuid -+ LIBUUID=-Wl,-luuid - fi - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion $LIBUUID -static-libgcc" - # The Windows platform requires special setup -@@ -3597,23 +3597,23 @@ - - VERSION_OBJECTS=`echo $VERSION_SOURCES` - VERSION_DEPENDS=`echo $VERSION_SOURCES` --VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'` -+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'` - VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\ --\\$(objects)/\\2.o: \\1/\\2.rc\\\\ -- \\$(WINDRES) \\$< \\$@,g"` -+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\ -+ \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"` - - SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` - SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` --SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` -+SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` - SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ --\\$(objects)/\\2.o: \\1/\\2.c\\\\ -+\\$(objects)/\\2.lo: \\1/\\2.c\\\\ - \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` - - SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES` - SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES` --SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` -+SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` - SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ --\\$(objects)/\\2.o: \\1/\\2.c\\\\ -+\\$(objects)/\\2.lo: \\1/\\2.c\\\\ - \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` - - # Set runtime shared library paths as needed ---- SDL2-2.0.5/Makefile.in -+++ SDL2-2.0.5/Makefile.in -@@ -36,10 +36,10 @@ - GEN_OBJECTS = @GEN_OBJECTS@ - VERSION_OBJECTS = @VERSION_OBJECTS@ - --SDLMAIN_TARGET = libSDL2main.a -+SDLMAIN_TARGET = libSDL2main.la - SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@ - --SDLTEST_TARGET = libSDL2_test.a -+SDLTEST_TARGET = libSDL2_test.la - SDLTEST_OBJECTS = @SDLTEST_OBJECTS@ - - WAYLAND_SCANNER = @WAYLAND_SCANNER@ -@@ -144,15 +144,13 @@ - .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) - - $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) -- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) - - $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) -- $(RUN_CMD_AR)$(AR) cru $@ $(SDLMAIN_OBJECTS) -- $(RUN_CMD_RANLIB)$(RANLIB) $@ -+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static - - $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) -- $(RUN_CMD_AR)$(AR) cru $@ $(SDLTEST_OBJECTS) -- $(RUN_CMD_RANLIB)$(RANLIB) $@ -+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static - - install: all install-bin install-hdrs install-lib install-data - install-bin: -@@ -173,10 +171,8 @@ - install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET) - $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir) - $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET) -- $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) -- $(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) -- $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET) -- $(RANLIB) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET) -+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) -+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET) - install-data: - $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal - $(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4 diff --git a/media-libs/libsdl2/libsdl2-2.0.5-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.5-r1.ebuild deleted file mode 100644 index 24af0fc24cd2..000000000000 --- a/media-libs/libsdl2/libsdl2-2.0.5-r1.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# TODO: convert FusionSound #484250 - -EAPI=6 -inherit autotools flag-o-matic toolchain-funcs eutils multilib-minimal - -MY_P=SDL2-${PV} -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="http://www.libsdl.org" -SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" - -IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver" -REQUIRED_USE=" - alsa? ( sound ) - fusionsound? ( sound ) - gles? ( video ) - nas? ( sound ) - opengl? ( video ) - pulseaudio? ( sound ) - wayland? ( gles ) - xinerama? ( X ) - xscreensaver? ( X )" - -RDEPEND=" - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) - gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) - nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] ) - opengl? ( - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland] - >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] - ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] - xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) - )" -DEPEND="${RDEPEND} - X? ( - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - ) - virtual/pkgconfig" - -PATCHES=( - # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 - "${FILESDIR}"/${PN}-2.0.5-static-libs.patch - "${FILESDIR}"/${PN}-2.0.5-ds3_ds4.patch -) - -S=${WORKDIR}/${MY_P} - -src_prepare() { - default - sed -i -e 's/configure.in/configure.ac/' Makefile.in || die - mv configure.{in,ac} || die - AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf -} - -multilib_src_configure() { - use custom-cflags || strip-flags - - # sorted by `./configure --help` - ECONF_SOURCE="${S}" econf \ - $(use_enable static-libs static) \ - --enable-atomic \ - $(use_enable sound audio) \ - $(use_enable video) \ - --enable-render \ - --enable-events \ - $(use_enable joystick) \ - $(use_enable haptic) \ - --enable-power \ - --enable-filesystem \ - $(use_enable threads) \ - --enable-timers \ - --enable-file \ - $(use_enable kernel_Winnt loadso) \ - --enable-cpuinfo \ - --enable-assembly \ - $(use_enable cpu_flags_x86_sse ssemath) \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable cpu_flags_x86_3dnow 3dnow) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable cpu_flags_x86_sse2 sse2) \ - $(use_enable altivec) \ - $(use_enable oss) \ - $(use_enable alsa) \ - --disable-alsa-shared \ - --disable-esd \ - $(use_enable pulseaudio) \ - --disable-pulseaudio-shared \ - --disable-arts \ - $(use_enable nas) \ - --disable-nas-shared \ - --disable-sndio \ - --disable-sndio-shared \ - $(use_enable sound diskaudio) \ - $(use_enable sound dummyaudio) \ - $(use_enable wayland video-wayland) \ - --disable-wayland-shared \ - --disable-video-mir \ - $(use_enable X video-x11) \ - --disable-x11-shared \ - $(use_enable X video-x11-xcursor) \ - $(use_enable X video-x11-xdbe) \ - $(use_enable xinerama video-x11-xinerama) \ - $(use_enable X video-x11-xinput) \ - $(use_enable X video-x11-xrandr) \ - $(use_enable xscreensaver video-x11-scrnsaver) \ - $(use_enable X video-x11-xshape) \ - $(use_enable X video-x11-vm) \ - --disable-video-cocoa \ - --disable-video-directfb \ - $(multilib_native_use_enable fusionsound) \ - --disable-fusionsound-shared \ - $(use_enable video video-dummy) \ - $(use_enable opengl video-opengl) \ - $(use_enable gles video-opengles) \ - $(use_enable udev libudev) \ - $(use_enable dbus) \ - --disable-ibus \ - $(use_enable tslib input-tslib) \ - --disable-directx \ - --disable-rpath \ - --disable-render-d3d \ - $(use_with X x) -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - prune_libtool_files - dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md -} diff --git a/media-libs/libsdl2/libsdl2-2.0.7.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild index 7926374b19b1..5424e85e492e 100644 --- a/media-libs/libsdl2/libsdl2-2.0.7.ebuild +++ b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild @@ -1,10 +1,8 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# TODO: convert FusionSound #484250 - EAPI=6 -inherit autotools flag-o-matic toolchain-funcs ltprune multilib-minimal +inherit autotools flag-o-matic ltprune toolchain-funcs multilib-minimal MY_P="SDL2-${PV}" DESCRIPTION="Simple Direct Media Layer" @@ -15,10 +13,9 @@ LICENSE="ZLIB" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver" +IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus gles haptic libsamplerate +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver" REQUIRED_USE=" alsa? ( sound ) - fusionsound? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) @@ -30,9 +27,11 @@ REQUIRED_USE=" RDEPEND=" alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) - nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] ) + libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) + nas? ( + >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] @@ -51,7 +50,6 @@ RDEPEND=" >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) @@ -115,6 +113,7 @@ multilib_src_configure() { $(use_enable pulseaudio) --disable-pulseaudio-shared --disable-arts + $(use_enable libsamplerate) $(use_enable nas) --disable-nas-shared --disable-sndio @@ -136,7 +135,7 @@ multilib_src_configure() { $(use_enable X video-x11-vm) --disable-video-cocoa --disable-video-directfb - $(multilib_native_use_enable fusionsound) + --disable-fusionsound --disable-fusionsound-shared $(use_enable video video-dummy) $(use_enable opengl video-opengl) diff --git a/media-libs/libsdl2/libsdl2-2.0.8.ebuild b/media-libs/libsdl2/libsdl2-2.0.8.ebuild deleted file mode 100644 index 7926374b19b1..000000000000 --- a/media-libs/libsdl2/libsdl2-2.0.8.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# TODO: convert FusionSound #484250 - -EAPI=6 -inherit autotools flag-o-matic toolchain-funcs ltprune multilib-minimal - -MY_P="SDL2-${PV}" -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="http://www.libsdl.org" -SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver" -REQUIRED_USE=" - alsa? ( sound ) - fusionsound? ( sound ) - gles? ( video ) - nas? ( sound ) - opengl? ( video ) - pulseaudio? ( sound ) - wayland? ( gles ) - xinerama? ( X ) - xscreensaver? ( X )" - -RDEPEND=" - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) - gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) - nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] ) - opengl? ( - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland] - >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] - ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] - xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) - )" -DEPEND="${RDEPEND} - X? ( - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - ) - virtual/pkgconfig" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/SDL2/SDL_config.h -) - -PATCHES=( - # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 - "${FILESDIR}"/${PN}-2.0.6-static-libs.patch -) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - sed -i -e 's/configure.in/configure.ac/' Makefile.in || die - mv configure.{in,ac} || die - AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf -} - -multilib_src_configure() { - use custom-cflags || strip-flags - - # sorted by `./configure --help` - local myeconfargs=( - $(use_enable static-libs static) - --enable-atomic - $(use_enable sound audio) - $(use_enable video) - --enable-render - --enable-events - $(use_enable joystick) - $(use_enable haptic) - --enable-power - --enable-filesystem - $(use_enable threads) - --enable-timers - --enable-file - $(use_enable kernel_Winnt loadso) - --enable-cpuinfo - --enable-assembly - $(use_enable cpu_flags_x86_sse ssemath) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_3dnow 3dnow) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable altivec) - $(use_enable oss) - $(use_enable alsa) - --disable-alsa-shared - --disable-esd - $(use_enable pulseaudio) - --disable-pulseaudio-shared - --disable-arts - $(use_enable nas) - --disable-nas-shared - --disable-sndio - --disable-sndio-shared - $(use_enable sound diskaudio) - $(use_enable sound dummyaudio) - $(use_enable wayland video-wayland) - --disable-wayland-shared - --disable-video-mir - $(use_enable X video-x11) - --disable-x11-shared - $(use_enable X video-x11-xcursor) - $(use_enable X video-x11-xdbe) - $(use_enable xinerama video-x11-xinerama) - $(use_enable X video-x11-xinput) - $(use_enable X video-x11-xrandr) - $(use_enable xscreensaver video-x11-scrnsaver) - $(use_enable X video-x11-xshape) - $(use_enable X video-x11-vm) - --disable-video-cocoa - --disable-video-directfb - $(multilib_native_use_enable fusionsound) - --disable-fusionsound-shared - $(use_enable video video-dummy) - $(use_enable opengl video-opengl) - --disable-video-opengles1 - $(use_enable gles video-opengles2) - --disable-video-vulkan - $(use_enable udev libudev) - $(use_enable dbus) - --disable-ibus - $(use_enable tslib input-tslib) - --disable-directx - --disable-rpath - --disable-render-d3d - $(use_with X x) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake V=1 -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - prune_libtool_files - dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md -} diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild index 823b92a87bc5..5ed3715ef487 100644 --- a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild +++ b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="http://critical.ch/distfiles/${P}.tgz" LICENSE="GPL-2" SLOT="1" -KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="static-libs" DEPEND="" RDEPEND="" diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest index bc108028855a..b13f0e00d5b9 100644 --- a/media-libs/vigra/Manifest +++ b/media-libs/vigra/Manifest @@ -1,2 +1,3 @@ DIST vigra-1.11.0-src.tar.gz 51854568 BLAKE2B 759390546989d52ffa5447b5434bd2d09b7ceba020ff72b953e9a671514ae2969be7a9f2918b21ab80d2952892219444315ad1df46e635e90a47edde957b6f11 SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a +DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3 DIST vigra-1.9.0-src.tar.gz 30813416 BLAKE2B ee5a84f1457b96bbda5077136558cf49ceb3f2b2c6727ab0ff07dc6bc7cd4dc99a8db9908b516110517c146a0f21bf87c33bdd038185fcc4ec38fdc5259d5e9f SHA512 8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757 diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild new file mode 100644 index 000000000000..6fa95e1699aa --- /dev/null +++ b/media-libs/vigra/vigra-1.11.1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +MY_P="${P}-src" +MY_V="${PV//\./-}" +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="threads,xml" + +inherit cmake-utils python-r1 + +DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" +HOMEPAGE="https://ukoethe.github.io/vigra/" +SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind" + +# runtime dependency on python:2.7 is required by the vigra-config script +RDEPEND=" + dev-lang/python:2.7 + >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}] + fftw? ( sci-libs/fftw:3.0 ) + hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] ) + jpeg? ( virtual/jpeg:0 ) + openexr? ( media-libs/openexr:= ) + png? ( media-libs/libpng:0= ) + python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] ) + tiff? ( media-libs/tiff:0= ) + valgrind? ( dev-util/valgrind )" + +DEPEND="${RDEPEND} + doc? ( + app-doc/doxygen + python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] ) + ) + test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )" + +REQUIRED_USE=" + doc? ( hdf5 fftw ) + python? ( hdf5 ${PYTHON_REQUIRED_USE} ) + test? ( hdf5 python fftw )" + +# Severely broken, also disabled in Fedora, bugs #390447, #653442 +RESTRICT="test" + +DOCS=( README.md ) + +pkg_setup() { + use python && python_setup +} + +src_prepare() { + einfo "Removing shipped docs and VCS files" + rm -rf doc || die + rm .git* .travis.yml || die + + cmake-utils_src_prepare + + # Don't use python_fix_shebang because we can't put this behind USE="python" + sed -i -e '/env/s:python:python2:' config/vigra-config.in || die +} + +src_configure() { + vigra_configure() { + local libdir="$(get_libdir)" + + local mycmakeargs=( + -DAUTOEXEC_TESTS=OFF + -DDOCDIR="${BUILD_DIR}/doc" + -DDOCINSTALL="share/doc/${P}" + -DLIBDIR_SUFFIX="${libdir/lib}" + -DUSE_DOC=$(usex doc ON OFF) # unused + -DUSE_FFTW3=$(usex fftw ON OFF) # unused + -DUSE_JPEG=$(usex jpeg ON OFF) # unused + -DUSE_MPI=$(usex mpi ON OFF) # unused + -DUSE_PNG=$(usex png ON OFF) # unused + -DUSE_TIFF=$(usex tiff ON OFF) # unused + -DWITH_HDF5=$(usex hdf5 ON OFF) + -DWITH_OPENEXR=$(usex openexr ON OFF) + -DWITH_VALGRIND=$(usex valgrind ON OFF) + -DWITH_VIGRANUMPY=$(usex python ON OFF) + -DBUILD_TESTING=$(usex test ON OFF) # unused + -DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused + -DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused + ) + cmake-utils_src_configure + } + + if use python; then + python_foreach_impl vigra_configure + else + # required for docdir + _cmake_check_build_dir init + vigra_configure + fi +} + +src_compile() { + local VIGRA_BUILD_DIR + vigra_compile() { + cmake-utils_src_compile + VIGRA_BUILD_DIR="${BUILD_DIR}" + } + if use python; then + python_foreach_impl vigra_compile + else + vigra_compile + fi + + if use doc; then + einfo "Generating Documentation" + # use build dir from last compile command + VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc + fi +} + +src_install() { + if use python; then + python_foreach_impl cmake-utils_src_install + python_optimize + else + cmake-utils_src_install + fi +} + +src_test() { + # perhaps disable tests (see #390447) + vigra_test() { + PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test + } + if use python; then + python_foreach_impl vigra_test + else + vigra_test + fi +} |