| 1 |
armin76 14/02/08 19:40:31 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: tigervnc-1.3.0-r1.ebuild |
| 5 |
Log: |
| 6 |
Revision bump with xorg-server-1.15 support wrt bug #500028 |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF6AD3240) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.171 net-misc/tigervnc/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/ChangeLog?rev=1.171&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/ChangeLog?rev=1.171&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/ChangeLog?r1=1.170&r2=1.171 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v |
| 20 |
retrieving revision 1.170 |
| 21 |
retrieving revision 1.171 |
| 22 |
diff -u -r1.170 -r1.171 |
| 23 |
--- ChangeLog 1 Feb 2014 19:15:18 -0000 1.170 |
| 24 |
+++ ChangeLog 8 Feb 2014 19:40:31 -0000 1.171 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for net-misc/tigervnc |
| 27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.170 2014/02/01 19:15:18 armin76 Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.171 2014/02/08 19:40:31 armin76 Exp $ |
| 30 |
+ |
| 31 |
+*tigervnc-1.3.0-r1 (08 Feb 2014) |
| 32 |
+ |
| 33 |
+ 08 Feb 2014; Raúl Porcel <armin76@g.o> +tigervnc-1.3.0-r1.ebuild: |
| 34 |
+ Revision bump with xorg-server-1.15 support wrt bug #500028 |
| 35 |
|
| 36 |
01 Feb 2014; Raúl Porcel <armin76@g.o> tigervnc-1.3.0.ebuild: |
| 37 |
Add missing dep, wrt bug #488666 |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 net-misc/tigervnc/tigervnc-1.3.0-r1.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/tigervnc-1.3.0-r1.ebuild?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/tigervnc-1.3.0-r1.ebuild?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: tigervnc-1.3.0-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
# Copyright 1999-2014 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.3.0-r1.ebuild,v 1.1 2014/02/08 19:40:31 armin76 Exp $ |
| 51 |
|
| 52 |
EAPI="4" |
| 53 |
|
| 54 |
inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic |
| 55 |
|
| 56 |
PATCHVER="0.2" |
| 57 |
XSERVER_VERSION="1.15.0" |
| 58 |
OPENGL_DIR="xorg-x11" |
| 59 |
#MY_P="${PN}-1.2.80-20130314svn5065" |
| 60 |
#S="${WORKDIR}/${MY_P}" |
| 61 |
|
| 62 |
DESCRIPTION="Remote desktop viewer display system" |
| 63 |
HOMEPAGE="http://www.tigervnc.org" |
| 64 |
SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.bz2 |
| 65 |
mirror://gentoo/${PN}.png |
| 66 |
mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2 |
| 67 |
http://dev.gentoo.org/~armin76/dist/${P}-patches-${PATCHVER}.tar.bz2 |
| 68 |
server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" |
| 69 |
|
| 70 |
LICENSE="GPL-2" |
| 71 |
SLOT="0" |
| 72 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" |
| 73 |
IUSE="gnutls java nptl +opengl pam server +xorgmodule" |
| 74 |
|
| 75 |
RDEPEND="virtual/jpeg:0 |
| 76 |
sys-libs/zlib |
| 77 |
>=x11-libs/libXtst-1.0.99.2 |
| 78 |
>=x11-libs/fltk-1.3.1 |
| 79 |
gnutls? ( net-libs/gnutls ) |
| 80 |
java? ( >=virtual/jre-1.5 ) |
| 81 |
pam? ( virtual/pam ) |
| 82 |
server? ( |
| 83 |
dev-lang/perl |
| 84 |
>=x11-libs/libXi-1.2.99.1 |
| 85 |
>=x11-libs/libXfont-1.4.2 |
| 86 |
>=x11-libs/libxkbfile-1.0.4 |
| 87 |
x11-libs/libXrender |
| 88 |
>=x11-libs/pixman-0.21.8 |
| 89 |
>=x11-apps/xauth-1.0.3 |
| 90 |
x11-apps/xsetroot |
| 91 |
>=x11-misc/xkeyboard-config-2.4.1-r3 |
| 92 |
opengl? ( >=app-admin/eselect-opengl-1.0.8 ) |
| 93 |
xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) |
| 94 |
) |
| 95 |
!net-misc/vnc |
| 96 |
!net-misc/tightvnc |
| 97 |
!net-misc/xf4vnc" |
| 98 |
DEPEND="${RDEPEND} |
| 99 |
amd64? ( dev-lang/nasm ) |
| 100 |
x86? ( dev-lang/nasm ) |
| 101 |
>=x11-proto/inputproto-2.1.99.3 |
| 102 |
>=x11-proto/xextproto-7.1.99 |
| 103 |
>=x11-proto/xproto-7.0.22 |
| 104 |
java? ( >=virtual/jdk-1.5 ) |
| 105 |
server? ( |
| 106 |
virtual/pkgconfig |
| 107 |
media-fonts/font-util |
| 108 |
x11-misc/util-macros |
| 109 |
>=x11-proto/bigreqsproto-1.1.0 |
| 110 |
>=x11-proto/compositeproto-0.4 |
| 111 |
>=x11-proto/damageproto-1.1 |
| 112 |
>=x11-proto/fixesproto-5.0 |
| 113 |
>=x11-proto/fontsproto-2.0.2 |
| 114 |
>=x11-proto/glproto-1.4.16 |
| 115 |
>=x11-proto/randrproto-1.4.0 |
| 116 |
>=x11-proto/renderproto-0.11 |
| 117 |
>=x11-proto/resourceproto-1.0.2 |
| 118 |
>=x11-proto/scrnsaverproto-1.1 |
| 119 |
>=x11-proto/videoproto-2.2.2 |
| 120 |
>=x11-proto/xcmiscproto-1.2.0 |
| 121 |
>=x11-proto/xineramaproto-1.1.3 |
| 122 |
>=x11-libs/xtrans-1.2.2 |
| 123 |
>=x11-proto/dri2proto-2.8 |
| 124 |
opengl? ( >=media-libs/mesa-7.8_rc[nptl=] ) |
| 125 |
)" |
| 126 |
|
| 127 |
CMAKE_IN_SOURCE_BUILD=1 |
| 128 |
|
| 129 |
pkg_setup() { |
| 130 |
if ! use server ; then |
| 131 |
echo |
| 132 |
einfo "The 'server' USE flag will build tigervnc's server." |
| 133 |
einfo "If '-server' is chosen only the client is built to save space." |
| 134 |
einfo "Stop the build now if you need to add 'server' to USE flags.\n" |
| 135 |
else |
| 136 |
ewarn "Forcing on xorg-x11 for new enough glxtokens.h..." |
| 137 |
OLD_IMPLEM="$(eselect opengl show)" |
| 138 |
eselect opengl set ${OPENGL_DIR} |
| 139 |
fi |
| 140 |
} |
| 141 |
|
| 142 |
switch_opengl_implem() { |
| 143 |
# Switch to the xorg implementation. |
| 144 |
# Use new opengl-update that will not reset user selected |
| 145 |
# OpenGL interface ... |
| 146 |
echo |
| 147 |
eselect opengl set ${OLD_IMPLEM} |
| 148 |
} |
| 149 |
|
| 150 |
src_prepare() { |
| 151 |
if use server ; then |
| 152 |
cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver |
| 153 |
else |
| 154 |
rm "${WORKDIR}"/patches/*_server_* |
| 155 |
fi |
| 156 |
|
| 157 |
EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \ |
| 158 |
EPATCH_FORCE="yes" epatch |
| 159 |
|
| 160 |
if use server ; then |
| 161 |
cd unix/xserver |
| 162 |
epatch ../xserver114.patch |
| 163 |
eautoreconf |
| 164 |
fi |
| 165 |
} |
| 166 |
|
| 167 |
src_configure() { |
| 168 |
|
| 169 |
use arm || use hppa && append-flags "-fPIC" |
| 170 |
|
| 171 |
mycmakeargs=( |
| 172 |
-G "Unix Makefiles" |
| 173 |
$(cmake-utils_use_enable gnutls GNUTLS) |
| 174 |
$(cmake-utils_use_enable pam PAM) |
| 175 |
$(cmake-utils_use_build java JAVA) |
| 176 |
) |
| 177 |
|
| 178 |
cmake-utils_src_configure |
| 179 |
|
| 180 |
if use server; then |
| 181 |
cd unix/xserver |
| 182 |
econf \ |
| 183 |
$(use_enable nptl glx-tls) \ |
| 184 |
$(use_enable opengl glx) \ |
| 185 |
--disable-config-dbus \ |
| 186 |
--disable-config-hal \ |
| 187 |
--disable-config-udev \ |
| 188 |
--disable-devel-docs \ |
| 189 |
--disable-dmx \ |
| 190 |
--disable-dri \ |
| 191 |
--disable-dri3 \ |
| 192 |
--disable-kdrive \ |
| 193 |
--disable-selective-werror \ |
| 194 |
--disable-silent-rules \ |
| 195 |
--disable-static \ |
| 196 |
--disable-unit-tests \ |
| 197 |
--disable-xephyr \ |
| 198 |
--disable-xinerama \ |
| 199 |
--disable-xnest \ |
| 200 |
--disable-xorg \ |
| 201 |
--disable-xvfb \ |
| 202 |
--disable-xwin \ |
| 203 |
--enable-dri2 \ |
| 204 |
--with-pic \ |
| 205 |
--without-dtrace \ |
| 206 |
--disable-present \ |
| 207 |
--disable-unit-tests |
| 208 |
fi |
| 209 |
} |
| 210 |
|
| 211 |
src_compile() { |
| 212 |
cmake-utils_src_compile |
| 213 |
|
| 214 |
if use server ; then |
| 215 |
cd unix/xserver |
| 216 |
emake |
| 217 |
fi |
| 218 |
} |
| 219 |
|
| 220 |
src_install() { |
| 221 |
cmake-utils_src_install |
| 222 |
|
| 223 |
newicon "${DISTDIR}"/tigervnc.png vncviewer.png |
| 224 |
make_desktop_entry vncviewer vncviewer vncviewer Network |
| 225 |
|
| 226 |
if use server ; then |
| 227 |
cd unix/xserver/hw/vnc |
| 228 |
emake DESTDIR="${D}" install |
| 229 |
! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg |
| 230 |
|
| 231 |
newconfd "${FILESDIR}"/${PN}.confd ${PN} |
| 232 |
newinitd "${FILESDIR}"/${PN}.initd ${PN} |
| 233 |
|
| 234 |
rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la |
| 235 |
else |
| 236 |
cd "${D}" |
| 237 |
for f in vncserver vncpasswd x0vncserver vncconfig; do |
| 238 |
rm usr/bin/$f |
| 239 |
rm usr/share/man/man1/$f.1 |
| 240 |
done |
| 241 |
fi |
| 242 |
} |
| 243 |
|
| 244 |
pkg_postinst() { |
| 245 |
use server && switch_opengl_implem |
| 246 |
} |
Archives