Revision: 3205
Author:   dominique
Date:     2021-01-21 16:17:53 +0100 (Thu, 21 Jan 2021)
Log Message:
-----------
Finaly got official wineasio to build in 32 and 64 bits

Modified Paths:
--------------
    trunk/overlays/proaudio/app-emulation/wineasio/ChangeLog
    trunk/overlays/proaudio/app-emulation/wineasio/Manifest

Added Paths:
-----------
    trunk/overlays/proaudio/app-emulation/wineasio/wineasio-1.0.0.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/app-emulation/wineasio/wineasio-9999.ebuild

Modified: trunk/overlays/proaudio/app-emulation/wineasio/ChangeLog
===================================================================
--- trunk/overlays/proaudio/app-emulation/wineasio/ChangeLog    2020-11-14 
07:13:22 UTC (rev 3204)
+++ trunk/overlays/proaudio/app-emulation/wineasio/ChangeLog    2021-01-21 
15:17:53 UTC (rev 3205)
@@ -1,7 +1,14 @@
 # ChangeLog for app-emulation/wineasio
-# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2021 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*wineasio-1.0.0 (21 Jan 2021)
+
+  21 Jan 2021: Dominique Michel <[email protected]> -9999 +1.0.0
+  -wineasio-9999.ebuild
+  +wineasio-1.0.0: make it to finaly build the 64 and 32 bits wineasio dll.
+  Tested with the 17.1 profile.
+
   17 Aug 2018: Dominique Michel <[email protected]> -0.7.3 -0.7.4 -0.7.5
   -0.9.2 9999: 0.9.2 doesn't compile anymore. Use a fork that compile;
   add path to installed 32 bits wine libs for the linker into Makefile;

Modified: trunk/overlays/proaudio/app-emulation/wineasio/Manifest
===================================================================
--- trunk/overlays/proaudio/app-emulation/wineasio/Manifest     2020-11-14 
07:13:22 UTC (rev 3204)
+++ trunk/overlays/proaudio/app-emulation/wineasio/Manifest     2021-01-21 
15:17:53 UTC (rev 3205)
@@ -1,3 +1,4 @@
-EBUILD wineasio-9999.ebuild 1949 BLAKE2B 
d68bb4ab250665ca93935ef36a0ebb7b6cac0939464a05745da8bf750cfda057aa685eec2970b75d7e19d02f6f60752254c1415d34652331ee344ac9e71fe390
 SHA512 
ccf061c6fd51326c4c6c9b47d5693306cecdc7fd1c792b5117891d12a0c873e91a0326b9da8369eb9b8be871cd145b4faaa7bddc54c4b1c77e4bdb62dfcda3cf
-MISC ChangeLog 1370 BLAKE2B 
e773514997b8873a6e809717f1493976f2d3f2a99ff703b004d7f0db4ab3ddd6091f811e0ac62affb16e87164ae1b8ab1ee9f0451b9424610439ca2e22e0ed3c
 SHA512 
527141cb6f8201a4da4bb18d0c90fb6a822c208947ab721476f2384c552e42e4a0649901321bac35bd32c08496bfc524da5aa9c97da38ee8d5b8a16978b21acb
+DIST wineasio-1.0.0.tar.gz 242947 BLAKE2B 
ac1fea94eb627468241db260229e6da29fbf79e2c7ee02bbed71e9e5e9f5f90bae624f37a23a89f20068ffe4d4e811064753ff9cb08325be47b3caae52156df8
 SHA512 
9401c4e3ae66b3ba98645a06cc551d275c813b30c3912bf1285aa4b85332298004dbf5c9c733ee7c023ff37e22d49efafcd9d1841aa07cc5ccefd8628571fcbf
+EBUILD wineasio-1.0.0.ebuild 2805 BLAKE2B 
cd3cc9142fc311034e5a405a35d4eeb380d1b1853c6611f831090e32ef4a245328050c0a9064215f6c0b8dc1eadf657786ec0f52b60a60f6ceb92c6970ddc1d7
 SHA512 
99d448334b6e60515ad49034dff1a4427c8bb51210633cd09e6fe7c594f8d4eeadef967ee087555a5159be1f93de4920731441a839f10f89a1e68e950b296c38
+MISC ChangeLog 1605 BLAKE2B 
b46e86196aba10cda214748000a9f3f879a2d5c604abb5a78defafa2d0cc9f8c399a8eb065297a1060aa34e82c83288fb40d01950047589ee315120f28d37ef8
 SHA512 
1523b5d7567cd23fb38ccc54ae0aabc0a0f44c422718445e5d8b3ee7fc78fc49811fc6700c88105e718e5b0c5757f7d3b028ab0908d20b651c96dafcc635a10d
 MISC metadata.xml 261 BLAKE2B 
ab09b95e48499595f240d83a5a2328b206d5983b57bbd4f6a0ba5f695a5be713ca35aaa6106a06a83a2e471d646e2ae12069c0779178823f1f9f30bd234a1dfe
 SHA512 
590077890c7cc0e1fd1c8b4388764030dcf95e6bd04f996a73839809b011e666a859417ae2ec91eba8af11e4fe5bbe9c89791e1eccd23b7fc6ec43cca304e0b1

Added: trunk/overlays/proaudio/app-emulation/wineasio/wineasio-1.0.0.ebuild
===================================================================
--- trunk/overlays/proaudio/app-emulation/wineasio/wineasio-1.0.0.ebuild        
                        (rev 0)
+++ trunk/overlays/proaudio/app-emulation/wineasio/wineasio-1.0.0.ebuild        
2021-01-21 15:17:53 UTC (rev 3205)
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-build multilib-minimal
+# git-r3
+
+DESCRIPTION="ASIO driver for Wine"
+HOMEPAGE="https://sourceforge.net/projects/wineasio";
+#EGIT_REPO_URI="https://github.com//${PN}.git";
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v1.0.0/${P}.tar.gz";
+RESTRICT="mirror"
+# forbid online operations
+#EVCS_OFFLINE=1
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE=""
+SLOT="0"
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+DEPEND="media-libs/asio-sdk"
+RDEPEND="virtual/wine[${MULTILIB_USEDEP}]
+       virtual/jack[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+       eapply_user
+       cp /opt/asiosdk2.2/common/asio.h .
+       WINE_FLAVOR_INSTALLED="$(eselect --brief wine show | sed -e 's:  ::')"
+       echo "Installed wine flavor = ${WINE_FLAVOR_INSTALLED}"
+       sed -i -e "s:INCLUDE_PATH         += 
-I\$(PREFIX)/include/wine:INCLUDE_PATH         += 
-I\$(PREFIX)/include/${WINE_FLAVOR_INSTALLED}/wine:" Makefile.mk || die "sed 
Makefile.mk failed"
+       cp Makefile.mk Makefile.mk.back || die "backup Makefile.mk failed"
+}
+
+multilib_src_compile() {
+       if multilib_is_native_abi; then
+               echo "Compiling wineasio 64 bits"
+               sed -i -e "s:-mnocygwin:-mnocygwin 
-L/usr/lib\$(M)/${WINE_FLAVOR_INSTALLED}/wine 
-L/usr/lib\$(M)/${WINE_FLAVOR_INSTALLED}:" Makefile.mk || die "sed Makefile.mk 
mnocygwin failed"
+               cp -f Makefile.mk.back Makefile.mk || die "Restoring 
Makefile.mk failed"
+               sed -i -e 
"s:-L/usr/lib\$(M)/wine:-L/usr/lib\$(M)/${WINE_FLAVOR_INSTALLED}/wine:" 
Makefile.mk || die "sed Makefile.mk failed"
+               emake 64
+       else
+               echo "Compiling wineasio 32 bits"
+               sed -i -e "s:-mnocygwin:-mnocygwin 
-L/usr/lib/${WINE_FLAVOR_INSTALLED}/wine -L/usr/lib/${WINE_FLAVOR_INSTALLED}:" 
Makefile.mk || die "sed Makefile.mk mnocygwin failed"
+               cp -f Makefile.mk.back Makefile.mk || die "Restoring 
Makefile.mk failed"
+               sed -i -e 
"s:-L/usr/lib\$(M)/wine:-L/usr/lib/${WINE_FLAVOR_INSTALLED}/wine:" Makefile.mk 
|| die "sed Makefile.mk failed"
+               emake 32
+       fi
+}
+
+src_compile() {
+       multilib_foreach_abi multilib_src_compile
+}
+
+multilib_src_install() {
+       if multilib_is_native_abi; then
+               mylibdir="lib64"
+               exeinto /usr/${mylibdir}/"${WINE_FLAVOR_INSTALLED}"/wine
+               doexe build64/${PN}.dll.so
+       else
+               mylibdir="lib"
+               exeinto /usr/${mylibdir}/"${WINE_FLAVOR_INSTALLED}"/wine
+               doexe build32/${PN}.dll.so
+       fi
+}
+
+src_install() {
+       multilib_foreach_abi multilib_src_install
+       dodoc README.md
+}
+
+pkg_postinst() {
+       echo
+       elog "You need to register the DLL by typing"
+       elog
+       elog "regsvr32 wineasio.dll"
+       elog
+       elog "AS THE USER who uses wine!"
+       elog
+       elog "On a 64 bit system with wine supporting both 32 and 64 bit 
applications, you must also type"
+       elog
+       elog "wine64 regsvr32 wineasio.dll"
+       elog
+       elog "Then open winecfg -> Audio -> and enable ONLY the ALSA driver!"
+       echo
+}

Deleted: trunk/overlays/proaudio/app-emulation/wineasio/wineasio-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/app-emulation/wineasio/wineasio-9999.ebuild 
2020-11-14 07:13:22 UTC (rev 3204)
+++ trunk/overlays/proaudio/app-emulation/wineasio/wineasio-9999.ebuild 
2021-01-21 15:17:53 UTC (rev 3205)
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib git-r3
-
-DESCRIPTION="ASIO driver for Wine"
-HOMEPAGE="http://sourceforge.net/projects/wineasio";
-# We use this fork because the 64 bits version compile out of the box and I 
get the 32 bits version to compile:
-EGIT_REPO_URI="https://github.com/Jajcus/${PN}.git";
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-SLOT="0"
-
-IUSE="+abi_x86_32 +abi_x86_64"
-
-DEPEND="media-libs/asio-sdk"
-RDEPEND="virtual/wine[abi_x86_32=,abi_x86_64=]
-       virtual/jack"
-
-
-src_prepare() {
-       eapply_user
-       cp /opt/asiosdk2.2/common/asio.h .
-       WINE_FLAVOR_INSTALLED="$(eselect --brief wine show | sed -e 's:  ::')"
-       echo "Installed wine flavor = ${WINE_FLAVOR_INSTALLED}"
-       sed -i -e "s:-mnocygwin:-mnocygwin 
-L/usr/lib32/${WINE_FLAVOR_INSTALLED}/wine 
-L/usr/lib32/${WINE_FLAVOR_INSTALLED}:" Makefile || die "sed Makefile failed"
-}
-
-src_compile() {
-       # compile 32 bit version
-       echo "Compiling wineasio 32 bits"
-       emake
-
-       #compile 64 bit version
-       if use amd64 ; then
-               echo "Compiling wineasio 64 bits"
-               mv ${PN}.dll.so ${PN}.dll.so.32
-               ./prepare_64bit_asio
-               make clean
-               emake -f Makefile64
-       fi
-}
-
-src_install() {
-       local mylibdir="lib"
-       # 64 bit install
-       if use amd64 ; then
-               mylibdir="lib64"
-               exeinto /usr/${mylibdir}/"${WINE_FLAVOR_INSTALLED}"/wine
-               doexe ${PN}.dll.so
-               mv ${PN}.dll.so.32 ${PN}.dll.so
-       fi
-       # 32 bit install
-       use amd64 && mylibdir="lib32"
-       exeinto /usr/${mylibdir}/"${WINE_FLAVOR_INSTALLED}"/wine
-       doexe ${PN}.dll.so
-
-       dodoc README
-}
-
-pkg_postinst() {
-       echo
-       elog "You need to register the DLL by typing"
-       elog
-       elog "regsvr32 wineasio.dll"
-       elog
-       elog "AS THE USER who uses wine!"
-       elog
-       elog "On a 64 bit system with wine supporting both 32 and 64 bit 
applications, you must also type"
-       elog
-       elog "wine64 regsvr32 wineasio.dll"
-       elog
-       elog "Then open winecfg -> Audio -> and enable ONLY the ALSA driver!"
-       echo
-}

Reply via email to