| 1 |
commit: d8c04bd8a1fce7010c8ad7daf3d6a755ac6842a0 |
| 2 |
Author: Fabio Rossi <rossi.f <AT> inwind <DOT> it> |
| 3 |
AuthorDate: Tue Apr 26 22:19:33 2016 +0000 |
| 4 |
Commit: Fabio Rossi <rossi.f <AT> inwind <DOT> net> |
| 5 |
CommitDate: Tue Apr 26 22:19:33 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=d8c04bd8 |
| 7 |
|
| 8 |
app-emulation/vmware-player: align with latest version of vmware-workstation |
| 9 |
|
| 10 |
.../vmware-player-12.1.0.3272444-r2.ebuild | 76 ++++++++++++---------- |
| 11 |
1 file changed, 42 insertions(+), 34 deletions(-) |
| 12 |
|
| 13 |
diff --git a/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild b/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild |
| 14 |
index 2a0e005..b5866c4 100644 |
| 15 |
--- a/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild |
| 16 |
+++ b/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild |
| 17 |
@@ -111,10 +111,8 @@ BUNDLED_LIB_DEPENDS=" |
| 18 |
x11-libs/gtk+:2 |
| 19 |
x11-libs/libXau |
| 20 |
x11-libs/libXcomposite |
| 21 |
- x11-libs/libXcursor |
| 22 |
x11-libs/libXdamage |
| 23 |
x11-libs/libXfixes |
| 24 |
- x11-libs/libXinerama |
| 25 |
x11-libs/libXrandr |
| 26 |
x11-libs/libXrender |
| 27 |
x11-libs/pango |
| 28 |
@@ -127,8 +125,10 @@ RDEPEND=" |
| 29 |
media-libs/alsa-lib |
| 30 |
net-print/cups |
| 31 |
x11-libs/libX11 |
| 32 |
+ x11-libs/libXcursor |
| 33 |
x11-libs/libXext |
| 34 |
x11-libs/libXi |
| 35 |
+ x11-libs/libXinerama |
| 36 |
x11-libs/libXtst |
| 37 |
x11-libs/startup-notification |
| 38 |
x11-themes/hicolor-icon-theme |
| 39 |
@@ -173,35 +173,45 @@ src_unpack() { |
| 40 |
} |
| 41 |
|
| 42 |
clean_bundled_libs() { |
| 43 |
- einfo "Removing bundled libraries" |
| 44 |
- for libname in ${BUNDLED_LIBS} ; do |
| 45 |
- rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}" |
| 46 |
- done |
| 47 |
- |
| 48 |
- rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs" |
| 49 |
- |
| 50 |
- # Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1 |
| 51 |
- # (needed by libcds.so) which seem to be compiled from openssl-1.0.1h. |
| 52 |
- # Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link |
| 53 |
- # in libcds.so to be able to use system libs. |
| 54 |
- pushd >/dev/null . |
| 55 |
- einfo "Patching libcds.so" |
| 56 |
- cd "${S}"/lib/lib/libcds.so || die |
| 57 |
- patchelf --replace-needed libssl.so.1.0.{1,0} \ |
| 58 |
- --replace-needed libcrypto.so.1.0.{1,0} \ |
| 59 |
- libcds.so || die |
| 60 |
- popd >/dev/null |
| 61 |
- |
| 62 |
- # vmware-player seems to use a custom version of libgksu2.so, for this reason |
| 63 |
- # we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED |
| 64 |
- # libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage |
| 65 |
- # preserve-libs mechanism to be triggered when a system lib is available (but not required) |
| 66 |
- pushd >/dev/null . |
| 67 |
- einfo "Patching libvmware-gksu.so" |
| 68 |
- cd "${S}"/lib/lib/libvmware-gksu.so || die |
| 69 |
- patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \ |
| 70 |
- libvmware-gksu.so || die |
| 71 |
- popd >/dev/null |
| 72 |
+ if ! use bundled-libs ; then |
| 73 |
+ einfo "Removing bundled libraries" |
| 74 |
+ for libname in ${BUNDLED_LIBS} ; do |
| 75 |
+ rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}" |
| 76 |
+ done |
| 77 |
+ |
| 78 |
+ rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs" |
| 79 |
+ |
| 80 |
+ # Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1 |
| 81 |
+ # (needed by libcds.so) which seem to be compiled from openssl-1.0.1h. |
| 82 |
+ # Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link |
| 83 |
+ # in libcds.so to be able to use system libs. |
| 84 |
+ pushd >/dev/null . |
| 85 |
+ einfo "Patching libcds.so" |
| 86 |
+ cd "${S}"/lib/lib/libcds.so || die |
| 87 |
+ patchelf --replace-needed libssl.so.1.0.{1,0} \ |
| 88 |
+ --replace-needed libcrypto.so.1.0.{1,0} \ |
| 89 |
+ libcds.so || die |
| 90 |
+ popd >/dev/null |
| 91 |
+ |
| 92 |
+ # vmware-player seems to use a custom version of libgksu2.so, for this reason |
| 93 |
+ # we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED |
| 94 |
+ # libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage |
| 95 |
+ # preserve-libs mechanism to be triggered when a system lib is available (but not required) |
| 96 |
+ pushd >/dev/null . |
| 97 |
+ einfo "Patching libvmware-gksu.so" |
| 98 |
+ cd "${S}"/lib/lib/libvmware-gksu.so || die |
| 99 |
+ patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \ |
| 100 |
+ libvmware-gksu.so || die |
| 101 |
+ popd >/dev/null |
| 102 |
+ else |
| 103 |
+ # if librsvg is not installed in the system then vmware doesn't start |
| 104 |
+ pushd >/dev/null . |
| 105 |
+ einfo "Patching svg_loader.so" |
| 106 |
+ cd "${S}"/lib/libconf/lib/gtk-2.0/2.10.0/loaders || die |
| 107 |
+ patchelf --set-rpath "\$ORIGIN/../../../../../lib/librsvg-2.so.2" \ |
| 108 |
+ svg_loader.so || die |
| 109 |
+ popd >/dev/null |
| 110 |
+ fi |
| 111 |
} |
| 112 |
|
| 113 |
src_prepare() { |
| 114 |
@@ -210,9 +220,7 @@ src_prepare() { |
| 115 |
# Bug 459566 |
| 116 |
mv lib/libvmware-netcfg.so lib/lib/ |
| 117 |
|
| 118 |
- if ! use bundled-libs ; then |
| 119 |
- clean_bundled_libs |
| 120 |
- fi |
| 121 |
+ clean_bundled_libs |
| 122 |
|
| 123 |
DOC_CONTENTS=" |
| 124 |
/etc/env.d is updated during ${PN} installation. Please run:\n |
Archives