diff options
Diffstat (limited to 'app-emulation/wine-staging')
| -rw-r--r-- | app-emulation/wine-staging/Manifest | 26 | ||||
| -rw-r--r-- | app-emulation/wine-staging/wine-staging-9.17.ebuild (renamed from app-emulation/wine-staging/wine-staging-9.16.ebuild) | 17 | ||||
| -rw-r--r-- | app-emulation/wine-staging/wine-staging-9.18.ebuild (renamed from app-emulation/wine-staging/wine-staging-9.13.ebuild) | 34 | ||||
| -rw-r--r-- | app-emulation/wine-staging/wine-staging-9.19.ebuild (renamed from app-emulation/wine-staging/wine-staging-9.14.ebuild) | 34 | ||||
| -rw-r--r-- | app-emulation/wine-staging/wine-staging-9.20.ebuild (renamed from app-emulation/wine-staging/wine-staging-9.15.ebuild) | 36 | ||||
| -rw-r--r-- | app-emulation/wine-staging/wine-staging-9999.ebuild | 31 |
6 files changed, 73 insertions, 105 deletions
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index 1ea4c88b5ced..37278d4a8eb8 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -2,19 +2,19 @@ AUX wine-staging-7.17-noexecstack.patch 223 BLAKE2B 6e6cfc208f11c2c2b7bbc392e370 AUX wine-staging-7.20-unwind.patch 1450 BLAKE2B 80e9222c95393aaa4b95e05597a4181030fc988d95e416d2f92631f29f640b9abb3dd0853d005de4725b41c09224e478741902075259d48a30830a923790579f SHA512 e1a72f1463be32975daa02064acb96189cd79cb41ff98f89b58e46c97100a3ac46405b1b9982378c9de275acbdb74168853e47b932e06398cdd2981b23f483ce AUX wine-staging-8.13-rpath.patch 554 BLAKE2B 209d8c581a9178242ee622338c5252f79b798cf5574f72b3984d71b7933e011b488060502715aa75630fbc3d10fcb03743ac31ed31664cacfc22b725253a117b SHA512 bbb25e02d19bd7c1a1f2d7db331d93cfcd5ce9172206ad9e19a44c52e5ece865d474eac024c2a5791dfa006c6efe0f68cd783ffc925ac793bf447d56090bdd02 DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1 SHA512 838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4 -DIST wine-9.13.tar.xz 30542188 BLAKE2B a832468142d68a21696d45d01ed8b9e464dc5f95e5a5205a08573024a2b0e7ccc4415388de4cef9581976b10a7e5723d9058e22cc56eed897b25b2a7fa369608 SHA512 f9c74beae87a02c4ae6176676bbc9de203224651ed4eeafbe6cfc05b8a455a9ce790d3211135fbeb6425719e4c0423e345dfee5ed2cefdb80706784f464f7225 -DIST wine-9.14.tar.xz 30561796 BLAKE2B 8055d311cd3d3d2c5f19e5f065066166afa41d8c95f946dea31931f2780953f2902b8bd36f5438ebc582cbe3c51fd4c221b429b9b9a6b59c0b8f9012a52b9bf4 SHA512 f242d4fa55db2d68813a8516c16f5404000e0da941c5e4796fea837625a67df16d31a60b7a4f5769662f0709086dc1d952e8d63cb16c493c805eff9a4264b117 -DIST wine-9.15.tar.xz 30580680 BLAKE2B 70a3dd1d566ce2022a197735bfbc6a879f99608d3b44dcb170dde68762b86cd880581bdc857090dad2733468f5aca3bb2613ef884fa35e361fce19e6e15dcef6 SHA512 4d19b7c0fbdf6ee5dc90c0aef800df47f5bda7e3506e5a3c065dcd29b33cc62840ae4eeb5c20c48e9400c0d1252b897d8bbc60fd5a58da1ad6e76ba677997cb3 -DIST wine-9.16.tar.xz 30638928 BLAKE2B 65665d674842980345d4f3730a75a1734fd5b9c3f08a2700624e4cc18b3d496a1db790e6098c404e05ea9544e671e2cf3f5d10f7fdc0863c6cf0714a9b597af9 SHA512 5f2994d20b8c7635125b38b6a4d89db4b71791f096276fa93e36dc6951c47c25b8a3354f0be0931799ac83c54f048e34693b56512cc446b93c74344b1a458187 +DIST wine-9.17.tar.xz 30684564 BLAKE2B 36049b7ed096865a647cea9ac1def6cf2a35984a72ae192d402a40f34c8a97e967cee31724d84d422f835f272fcba9ba818e1e787f7940b18d835aa234b0c6b7 SHA512 06ee82fc0f0c8c02f1f646f674e8e3c5d4b9ca9cf64a910b01eb9c6d5dbe0471a6b232875e099c2e5cfd8e1c183ee72850820f24fc026b11523b56872a2efec5 +DIST wine-9.18.tar.xz 30760808 BLAKE2B 2ac93d28c76358be47615d6a1f053fc61ff023193bd000cacded262ceafb39072778461c72fc797657df6ae71c7fc072d0bfe69da04660cd14e4b6ddec36a0b5 SHA512 d6e049374d1e654937a0c767215076e5f12c7ff69aac930881292c075d0eee1a1af4c38937271c515875db12b98adebe8553d356b30e32d78d9ac8b1c7914509 +DIST wine-9.19.tar.xz 30812468 BLAKE2B 24bdcd8d06c9f6b480dbb92469b41ff21b4174fcea6eaccf2359616f018d1c0a1305b5ae8acfcb2f7161b285963f26cc16530d1518db3d1bda7cdbb9807860d5 SHA512 530219c6a337f2996eac92d644ab603528b82cc6136cc37c1e6aa736d418f33c6f4b0d54f3537b04bceaf4487d84abcf926a2f5e9536ed4e966c4fe63c5b6ddd +DIST wine-9.20.tar.xz 31807848 BLAKE2B f2fef5c941284a5f89f92696cb242641ad88ea8a4388dd6d72977d9696ab63c1632b91b678567525527c80e30ad5ef2971e5bcf700e4f2d7db9bf3357488ed34 SHA512 65d229cfa1c4daffd0b1cec4480bdc4f8a2bbdeb08a7885efea403b0533beda6a22616e57f8e55038fe9e033137cf2718148e38076409a8c0341b29127bbefa3 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718 SHA512 362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f -DIST wine-staging-9.13.tar.gz 9486868 BLAKE2B ef89e0c542689dfab7cc761ee210e434df9586f997da19868991752f6aa152494060ba39e9d70f8652749d77c0273b86b11fb06ff27efe3e4e1af9ef2795c969 SHA512 a43e1ac3be6e9563cf14b27bbfeb7b916b10322affacaf4fb1b648444ff6d43f8f15f7b31b01c692add884d45394acd21f0699ed25c52e1a021a821cf47d6168 -DIST wine-staging-9.14.tar.gz 9452219 BLAKE2B 31da595c5e6a51bbf5a244b2a40bbc02d536c4bd64468ef5615bf2c1356967d2e18f0c68d3ff30a6fec31362373a1a24871362fd08d27d76780fd400d290a28c SHA512 ab5fcbc32d6920be887618f58d2b848f42ee90677b4fe24c40cda40f26d640168e96c5021edb5c27ed2355cc3b2ec19a99bc3a8a745abdbb70a8498703a3db91 -DIST wine-staging-9.15.tar.gz 9516589 BLAKE2B e0511494a9cefec0349f7f24830e6dafb032ea33290b09c9b168f06cc7c621a53ede34dbc379a0adb17feb17af4d8872c6863ca4a38c5979572feaa3c0cabbc5 SHA512 37237e4f19319e34341fef1bb656d5c98309d148cdef7f105e7cd4eb10134364766df5287755ba23ebc2a3d28294bd10c7991c9a3acbe076ad33a386ae92b304 -DIST wine-staging-9.16.tar.gz 9506127 BLAKE2B 05311c5af15052b1a8d846d3ff3f09b476b71eb13f82e37e8d1dcd08032c85d9ab03c27f595d5b72dd121f143f07b6b7246b7bd9f8df16e0923aa26a8f92195f SHA512 513af6d56f491e49c29ffced546b9025d0dbd4cf0c0186cd118132380bf58f45277d129c49fd3f5bc1ccc5d391e456fd2f0792b60b92d1dc448ba8b1f98efa34 +DIST wine-staging-9.17.tar.gz 9383269 BLAKE2B b82d74a6cfefce477193f72906fccd69dc34e4199db4f9c68efda484dfc462b6a828c549d4428f6a3c7479d3a3ad939eb3f4b28b2d64e31093d107b1c2316ef8 SHA512 ce21e026870dece09713eb64a046381942085742456057dc147490968724a0f7dc5ef059f0b26f9125f20de50a3e6beaae5cea2aa95ab1fae3e1d92305d92488 +DIST wine-staging-9.18.tar.gz 9439240 BLAKE2B fd21f9d49e2ab28a1b6dc15c01559b42626b6c62cdb59d56ac134c6e8ecb9b3ec40ce34f39b9aa9bfdb7204acdcaf5556f3b7fd396e0269bbc674d915a5597d5 SHA512 21c7ff8e80f48837cbb268ef932906c65fb3d77cf72dfc4f9118fb72a216906222ed051cef9986aa2fd2339e86bd3a5766c93e9390d95dbb7bc46eebfe55ac66 +DIST wine-staging-9.19.tar.gz 9460757 BLAKE2B 20b5cb89b73409bb45129cc59ed776271cb45347bb344a3f5b4b8075d783dd6f6ff03b14ab0bc4237b67020b909f6235c0fb8822331f171915dbf2c4417cb78e SHA512 c2504af047125e2bf29e4c1d9d7bef275a7bc236bc85344977448a8c4a2bd32cdb813db4ebe26de1b91d04371751ffe3498b9d9c96793d3d3d236fe6be9903dd +DIST wine-staging-9.20.tar.gz 9518651 BLAKE2B 77bd59dfc9f18a159d6256e3b5c92a8badbdf64c7e2f86fe0dbd2372d28e7643adb35b9f209ea431f4ea49c0db65f07681fc53272e9e26e3f8a6284baba352fe SHA512 fec41c68bc9396d0c40545f6eadd7ad7ba2ecdd886df6e5060be9e288e95790040f70a3c889ce8fa26b42829bef702d31f105eeede795f0a1d17f716f6c6682d EBUILD wine-staging-9.0.ebuild 15677 BLAKE2B a60e2f72c3896f6de7b045ba51c41338531eb2dccd0b783725c1c793cddf4f17311c5941c99b0d29bc1b61607bb4e26c4114b3240b4c3b219927d26151406593 SHA512 affaba6aff52e930d8345a5b3c6ecf4df5479463f4bf8ad036b9215f7f802bc94efa5ac47897af11bdd9a12f5d93947fdda4407ddc75b937a489f783c9cf2389 -EBUILD wine-staging-9.13.ebuild 15626 BLAKE2B fe79586585ba421d064a6faa036c74b8f46b4d5feff410f574e6e337bded0985c37b9db9d17668642f7336b0adeb08a3eeecf0fc66f15d7645cd3491baff12cb SHA512 7ba67b3cc50b090f783c11eca7d48c98ded782bcc1027851d4ce9c6b2aa040a811b70118295a19ce1ee48db51ddf8aa316674b53e14573d57da370607659e70e -EBUILD wine-staging-9.14.ebuild 15626 BLAKE2B fe79586585ba421d064a6faa036c74b8f46b4d5feff410f574e6e337bded0985c37b9db9d17668642f7336b0adeb08a3eeecf0fc66f15d7645cd3491baff12cb SHA512 7ba67b3cc50b090f783c11eca7d48c98ded782bcc1027851d4ce9c6b2aa040a811b70118295a19ce1ee48db51ddf8aa316674b53e14573d57da370607659e70e -EBUILD wine-staging-9.15.ebuild 15626 BLAKE2B fe79586585ba421d064a6faa036c74b8f46b4d5feff410f574e6e337bded0985c37b9db9d17668642f7336b0adeb08a3eeecf0fc66f15d7645cd3491baff12cb SHA512 7ba67b3cc50b090f783c11eca7d48c98ded782bcc1027851d4ce9c6b2aa040a811b70118295a19ce1ee48db51ddf8aa316674b53e14573d57da370607659e70e -EBUILD wine-staging-9.16.ebuild 15362 BLAKE2B ff86f4c7e9af10c8932575228d1650084ef80a272134cf3c2bbedbfb6652112065d46c7a4d1fd48a71624e9a1fe5ac980fdef8af033336a19cb9820435370dc2 SHA512 ad0e436b696090f156149ae23330d296a142446a200877fc8459c631fb30182f3b7e43499cc99ec4132df223d38e002e578878c5f9890d89b6a0a9f532d53061 -EBUILD wine-staging-9999.ebuild 15362 BLAKE2B ff86f4c7e9af10c8932575228d1650084ef80a272134cf3c2bbedbfb6652112065d46c7a4d1fd48a71624e9a1fe5ac980fdef8af033336a19cb9820435370dc2 SHA512 ad0e436b696090f156149ae23330d296a142446a200877fc8459c631fb30182f3b7e43499cc99ec4132df223d38e002e578878c5f9890d89b6a0a9f532d53061 +EBUILD wine-staging-9.17.ebuild 15386 BLAKE2B 6035e7adedc96d16b34d7d96741b479171e010fee0115470df8a35df358816cc7a7843934a804daf749d8a41de1498761f4b9026648cb3a9dba6952d0ddbff8a SHA512 133cae5f3d231f3d2e9552c0af9d563d33ee8497cb54a73b754afcb666e0eba485838617d02ab27755f802e1dfb95a185c13d4a660eaa3d99c9a0e9f2e5663d6 +EBUILD wine-staging-9.18.ebuild 15468 BLAKE2B 9cb861dd4f2018ee042a968c93da960fc332426e970769e3a96de2378a7e51f458e45cf32344f2cd03454f88d9caa01800beb9723f119d3c51acfa3cc9248f1b SHA512 eb2b3a9d0e986e1ba785891a274afbd08fde4bd6132fa3e1bc4cb76c36cb3cb7489a177ea8c44966b1d3d0939335b7f2475d60e89849ed779621dd4eb943dafd +EBUILD wine-staging-9.19.ebuild 15468 BLAKE2B 9cb861dd4f2018ee042a968c93da960fc332426e970769e3a96de2378a7e51f458e45cf32344f2cd03454f88d9caa01800beb9723f119d3c51acfa3cc9248f1b SHA512 eb2b3a9d0e986e1ba785891a274afbd08fde4bd6132fa3e1bc4cb76c36cb3cb7489a177ea8c44966b1d3d0939335b7f2475d60e89849ed779621dd4eb943dafd +EBUILD wine-staging-9.20.ebuild 15472 BLAKE2B b8b13031f73e42796085049da0a2119bd15b1745b7cd2fcdc6a7202bf1f14df18189bb7467cb5ec600fa6831586bc104bc2d24fb98c77ec343196bd07881a404 SHA512 1316993868030c4f4daee9474c66988e2710d64b10702c515eb052ba3d4f42e4e5c22eda277fa4d778fbc68583596936c0e522ced24e36f183bd17869d1d741d +EBUILD wine-staging-9999.ebuild 15472 BLAKE2B b8b13031f73e42796085049da0a2119bd15b1745b7cd2fcdc6a7202bf1f14df18189bb7467cb5ec600fa6831586bc104bc2d24fb98c77ec343196bd07881a404 SHA512 1316993868030c4f4daee9474c66988e2710d64b10702c515eb052ba3d4f42e4e5c22eda277fa4d778fbc68583596936c0e522ced24e36f183bd17869d1d741d MISC metadata.xml 2659 BLAKE2B 8a80b12643e82b98b71bc408e2fd79736da01c8f7d914c7a592cb685893ea3896bc44fecf0160faec803b284d3f6bb38cf36fb4745d9d43e0e1ced8702fcaf9d SHA512 a271e537318a4e90236c195f1f8c24c3255b5465345246627797d37238e2b6292d0734a9ab19542ee34fc1e9312dc4418694992f5ce3c53310228cc6bf14ef90 diff --git a/app-emulation/wine-staging/wine-staging-9.16.ebuild b/app-emulation/wine-staging/wine-staging-9.17.ebuild index 992a6503e0ea..79e21a4a3b45 100644 --- a/app-emulation/wine-staging/wine-staging-9.16.ebuild +++ b/app-emulation/wine-staging/wine-staging-9.17.ebuild @@ -9,7 +9,7 @@ inherit autotools edo flag-o-matic multilib multilib-build optfeature inherit prefix python-any-r1 toolchain-funcs wrapper WINE_GECKO=2.47.4 -WINE_MONO=9.2.0 +WINE_MONO=9.3.0 WINE_P=wine-$(ver_cut 1-2) if [[ ${PV} == *9999 ]]; then @@ -74,6 +74,7 @@ WINE_DLOPEN_DEPEND=" fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) netapi? ( net-fs/samba[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] ) @@ -95,7 +96,6 @@ WINE_COMMON_DEPEND=" media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] ) - odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) @@ -140,21 +140,16 @@ DEPEND=" sys-kernel/linux-headers X? ( x11-base/xorg-proto ) " -# gitapply.sh prefers git but can fallback to patch+extras +# gitapply.sh "can" work without git but that is hardly tested +# and known failing with some versions, so force real git BDEPEND=" ${PYTHON_DEPS} || ( - dev-vcs/git - ( - sys-apps/gawk - sys-apps/util-linux - ) - ) - || ( sys-devel/binutils sys-devel/lld ) dev-lang/perl + dev-vcs/git sys-devel/bison sys-devel/flex virtual/pkgconfig @@ -297,7 +292,6 @@ src_configure() { $(use_with mingw) $(use_with netapi) $(use_with nls gettext) - $(use_with odbc) $(use_with opencl) $(use_with opengl) $(use_with osmesa) @@ -318,6 +312,7 @@ src_configure() { $(use_with wayland) $(use_with xcomposite) $(use_with xinerama) + $(usev !odbc ac_cv_lib_soname_odbc=) ) filter-lto # build failure diff --git a/app-emulation/wine-staging/wine-staging-9.13.ebuild b/app-emulation/wine-staging/wine-staging-9.18.ebuild index 701e686b693b..69c45f1c51f2 100644 --- a/app-emulation/wine-staging/wine-staging-9.13.ebuild +++ b/app-emulation/wine-staging/wine-staging-9.18.ebuild @@ -9,7 +9,7 @@ inherit autotools edo flag-o-matic multilib multilib-build optfeature inherit prefix python-any-r1 toolchain-funcs wrapper WINE_GECKO=2.47.4 -WINE_MONO=9.2.0 +WINE_MONO=9.3.0 WINE_P=wine-$(ver_cut 1-2) if [[ ${PV} == *9999 ]]; then @@ -36,11 +36,11 @@ LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff" SLOT="${PV}" IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos - llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer - kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap - perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip - +truetype udev udisks +unwind usb v4l +vulkan wayland wow64 - +xcomposite xinerama + llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2 + +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl + osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard + +ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland + wow64 +xcomposite xinerama " # bug #551124 for truetype # TODO: wow64 can be done without mingw if using clang (needs bug #912237) @@ -74,6 +74,7 @@ WINE_DLOPEN_DEPEND=" fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) netapi? ( net-fs/samba[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] ) @@ -89,13 +90,13 @@ WINE_COMMON_DEPEND=" ) alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] ) + ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gstreamer? ( dev-libs/glib:2[${MULTILIB_USEDEP}] media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] ) - odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) @@ -140,21 +141,16 @@ DEPEND=" sys-kernel/linux-headers X? ( x11-base/xorg-proto ) " -# gitapply.sh prefers git but can fallback to patch+extras +# gitapply.sh "can" work without git but that is hardly tested +# and known failing with some versions, so force real git BDEPEND=" ${PYTHON_DEPS} || ( - dev-vcs/git - ( - sys-apps/gawk - sys-apps/util-linux - ) - ) - || ( sys-devel/binutils sys-devel/lld ) dev-lang/perl + dev-vcs/git sys-devel/bison sys-devel/flex virtual/pkgconfig @@ -289,6 +285,7 @@ src_configure() { $(use_with alsa) $(use_with capi) $(use_with cups) + $(use_with ffmpeg) $(use_with fontconfig) $(use_with gphoto2 gphoto) $(use_with gstreamer) @@ -297,7 +294,6 @@ src_configure() { $(use_with mingw) $(use_with netapi) $(use_with nls gettext) - $(use_with odbc) $(use_with opencl) $(use_with opengl) $(use_with osmesa) @@ -318,6 +314,7 @@ src_configure() { $(use_with wayland) $(use_with xcomposite) $(use_with xinerama) + $(usev !odbc ac_cv_lib_soname_odbc=) ) filter-lto # build failure @@ -334,11 +331,6 @@ src_configure() { strip-unsupported-flags fi - # >=wine-vanilla-9 has proper fixes and builds with gcc-14, but - # staging patchset is messier and would rather not have to worry - # about it (try to remove on bump now and then, bug #919758) - append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types) - if use mingw; then use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} diff --git a/app-emulation/wine-staging/wine-staging-9.14.ebuild b/app-emulation/wine-staging/wine-staging-9.19.ebuild index 701e686b693b..69c45f1c51f2 100644 --- a/app-emulation/wine-staging/wine-staging-9.14.ebuild +++ b/app-emulation/wine-staging/wine-staging-9.19.ebuild @@ -9,7 +9,7 @@ inherit autotools edo flag-o-matic multilib multilib-build optfeature inherit prefix python-any-r1 toolchain-funcs wrapper WINE_GECKO=2.47.4 -WINE_MONO=9.2.0 +WINE_MONO=9.3.0 WINE_P=wine-$(ver_cut 1-2) if [[ ${PV} == *9999 ]]; then @@ -36,11 +36,11 @@ LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff" SLOT="${PV}" IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos - llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer - kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap - perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip - +truetype udev udisks +unwind usb v4l +vulkan wayland wow64 - +xcomposite xinerama + llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2 + +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl + osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard + +ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland + wow64 +xcomposite xinerama " # bug #551124 for truetype # TODO: wow64 can be done without mingw if using clang (needs bug #912237) @@ -74,6 +74,7 @@ WINE_DLOPEN_DEPEND=" fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) netapi? ( net-fs/samba[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] ) @@ -89,13 +90,13 @@ WINE_COMMON_DEPEND=" ) alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] ) + ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gstreamer? ( dev-libs/glib:2[${MULTILIB_USEDEP}] media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] ) - odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) @@ -140,21 +141,16 @@ DEPEND=" sys-kernel/linux-headers X? ( x11-base/xorg-proto ) " -# gitapply.sh prefers git but can fallback to patch+extras +# gitapply.sh "can" work without git but that is hardly tested +# and known failing with some versions, so force real git BDEPEND=" ${PYTHON_DEPS} || ( - dev-vcs/git - ( - sys-apps/gawk - sys-apps/util-linux - ) - ) - || ( sys-devel/binutils sys-devel/lld ) dev-lang/perl + dev-vcs/git sys-devel/bison sys-devel/flex virtual/pkgconfig @@ -289,6 +285,7 @@ src_configure() { $(use_with alsa) $(use_with capi) $(use_with cups) + $(use_with ffmpeg) $(use_with fontconfig) $(use_with gphoto2 gphoto) $(use_with gstreamer) @@ -297,7 +294,6 @@ src_configure() { $(use_with mingw) $(use_with netapi) $(use_with nls gettext) - $(use_with odbc) $(use_with opencl) $(use_with opengl) $(use_with osmesa) @@ -318,6 +314,7 @@ src_configure() { $(use_with wayland) $(use_with xcomposite) $(use_with xinerama) + $(usev !odbc ac_cv_lib_soname_odbc=) ) filter-lto # build failure @@ -334,11 +331,6 @@ src_configure() { strip-unsupported-flags fi - # >=wine-vanilla-9 has proper fixes and builds with gcc-14, but - # staging patchset is messier and would rather not have to worry - # about it (try to remove on bump now and then, bug #919758) - append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types) - if use mingw; then use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} diff --git a/app-emulation/wine-staging/wine-staging-9.15.ebuild b/app-emulation/wine-staging/wine-staging-9.20.ebuild index 701e686b693b..983b7367f85a 100644 --- a/app-emulation/wine-staging/wine-staging-9.15.ebuild +++ b/app-emulation/wine-staging/wine-staging-9.20.ebuild @@ -9,7 +9,7 @@ inherit autotools edo flag-o-matic multilib multilib-build optfeature inherit prefix python-any-r1 toolchain-funcs wrapper WINE_GECKO=2.47.4 -WINE_MONO=9.2.0 +WINE_MONO=9.3.0 WINE_P=wine-$(ver_cut 1-2) if [[ ${PV} == *9999 ]]; then @@ -32,15 +32,15 @@ HOMEPAGE=" S="${WORKDIR}/${WINE_P}" -LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff" +LICENSE="LGPL-2.1+ BSD BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff" SLOT="${PV}" IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos - llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer - kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap - perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip - +truetype udev udisks +unwind usb v4l +vulkan wayland wow64 - +xcomposite xinerama + llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2 + +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl + osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard + +ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland + wow64 +xcomposite xinerama " # bug #551124 for truetype # TODO: wow64 can be done without mingw if using clang (needs bug #912237) @@ -74,6 +74,7 @@ WINE_DLOPEN_DEPEND=" fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) netapi? ( net-fs/samba[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] ) @@ -89,13 +90,13 @@ WINE_COMMON_DEPEND=" ) alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] ) + ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gstreamer? ( dev-libs/glib:2[${MULTILIB_USEDEP}] media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] ) - odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) @@ -140,21 +141,16 @@ DEPEND=" sys-kernel/linux-headers X? ( x11-base/xorg-proto ) " -# gitapply.sh prefers git but can fallback to patch+extras +# gitapply.sh "can" work without git but that is hardly tested +# and known failing with some versions, so force real git BDEPEND=" ${PYTHON_DEPS} || ( - dev-vcs/git - ( - sys-apps/gawk - sys-apps/util-linux - ) - ) - || ( sys-devel/binutils sys-devel/lld ) dev-lang/perl + dev-vcs/git sys-devel/bison sys-devel/flex virtual/pkgconfig @@ -289,6 +285,7 @@ src_configure() { $(use_with alsa) $(use_with capi) $(use_with cups) + $(use_with ffmpeg) $(use_with fontconfig) $(use_with gphoto2 gphoto) $(use_with gstreamer) @@ -297,7 +294,6 @@ src_configure() { $(use_with mingw) $(use_with netapi) $(use_with nls gettext) - $(use_with odbc) $(use_with opencl) $(use_with opengl) $(use_with osmesa) @@ -318,6 +314,7 @@ src_configure() { $(use_with wayland) $(use_with xcomposite) $(use_with xinerama) + $(usev !odbc ac_cv_lib_soname_odbc=) ) filter-lto # build failure @@ -334,11 +331,6 @@ src_configure() { strip-unsupported-flags fi - # >=wine-vanilla-9 has proper fixes and builds with gcc-14, but - # staging patchset is messier and would rather not have to worry - # about it (try to remove on bump now and then, bug #919758) - append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types) - if use mingw; then use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 992a6503e0ea..983b7367f85a 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -9,7 +9,7 @@ inherit autotools edo flag-o-matic multilib multilib-build optfeature inherit prefix python-any-r1 toolchain-funcs wrapper WINE_GECKO=2.47.4 -WINE_MONO=9.2.0 +WINE_MONO=9.3.0 WINE_P=wine-$(ver_cut 1-2) if [[ ${PV} == *9999 ]]; then @@ -32,15 +32,15 @@ HOMEPAGE=" S="${WORKDIR}/${WINE_P}" -LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff" +LICENSE="LGPL-2.1+ BSD BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff" SLOT="${PV}" IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos - llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer - kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap - perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip - +truetype udev udisks +unwind usb v4l +vulkan wayland wow64 - +xcomposite xinerama + llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2 + +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl + osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard + +ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland + wow64 +xcomposite xinerama " # bug #551124 for truetype # TODO: wow64 can be done without mingw if using clang (needs bug #912237) @@ -74,6 +74,7 @@ WINE_DLOPEN_DEPEND=" fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) netapi? ( net-fs/samba[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] ) @@ -89,13 +90,13 @@ WINE_COMMON_DEPEND=" ) alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] ) + ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gstreamer? ( dev-libs/glib:2[${MULTILIB_USEDEP}] media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] ) - odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) @@ -140,21 +141,16 @@ DEPEND=" sys-kernel/linux-headers X? ( x11-base/xorg-proto ) " -# gitapply.sh prefers git but can fallback to patch+extras +# gitapply.sh "can" work without git but that is hardly tested +# and known failing with some versions, so force real git BDEPEND=" ${PYTHON_DEPS} || ( - dev-vcs/git - ( - sys-apps/gawk - sys-apps/util-linux - ) - ) - || ( sys-devel/binutils sys-devel/lld ) dev-lang/perl + dev-vcs/git sys-devel/bison sys-devel/flex virtual/pkgconfig @@ -289,6 +285,7 @@ src_configure() { $(use_with alsa) $(use_with capi) $(use_with cups) + $(use_with ffmpeg) $(use_with fontconfig) $(use_with gphoto2 gphoto) $(use_with gstreamer) @@ -297,7 +294,6 @@ src_configure() { $(use_with mingw) $(use_with netapi) $(use_with nls gettext) - $(use_with odbc) $(use_with opencl) $(use_with opengl) $(use_with osmesa) @@ -318,6 +314,7 @@ src_configure() { $(use_with wayland) $(use_with xcomposite) $(use_with xinerama) + $(usev !odbc ac_cv_lib_soname_odbc=) ) filter-lto # build failure |