View | Details | Raw Unified | Return to bug 201693 | Differences between
and this patch

Collapse All | Expand All

(-)google-earth/Makefile (-6 / +15 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	google-earth
3
PORTNAME=	google-earth
4
PORTVERSION=	6.0.3.2197
4
PORTVERSION=	6.0.3.2197
5
PORTREVISION=	2
5
PORTREVISION=	3
6
PORTEPOCH=	3
6
PORTEPOCH=	3
7
CATEGORIES=	astro deskutils geography
7
CATEGORIES=	astro deskutils geography
8
MASTER_SITES=	http://dl.google.com/earth/client/advanced/previous/:previous \
8
MASTER_SITES=	http://dl.google.com/earth/client/advanced/previous/:previous \
Lines 20-26 Link Here
20
20
21
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\..*//g}/
21
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\..*//g}/
22
22
23
OPTIONS_DEFINE=	NVIDIA
23
OPTIONS_DEFAULT=LINUX_DRI
24
OPTIONS_SINGLE=LIBGL
25
OPTIONS_SINGLE_LIBGL=	LINUX_DRI NVIDIA_GL NVIDIA_GL_340 NVIDIA_GL_304 NVIDIA_GL_173
26
LINUX_DRI_DESC=	libGL support via linux dri libraries 
27
NVIDIA_GL_340_DESC=	libGL support via nvidia-driver-340
28
NVIDIA_GL_304_DESC=	libGL support via nvidia-driver-304
29
NVIDIA_GL_173_DESC=	libGL support via nvidia-driver-173
24
30
25
USE_LINUX=	yes
31
USE_LINUX=	yes
26
USE_LINUX_APPS=	xorglibs curl
32
USE_LINUX_APPS=	xorglibs curl
Lines 31-38 Link Here
31
37
32
UNMAKESELF=	${LOCALBASE}/bin/unmakeself
38
UNMAKESELF=	${LOCALBASE}/bin/unmakeself
33
39
34
NVIDIA_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
40
NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
35
NVIDIA_USE_OFF=	LINUX_APPS=dri,libpciaccess
41
NVIDIA_GL_340_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver-340
42
NVIDIA_GL_304_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver-304
43
NVIDIA_GL_173_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver-173
44
LINUX_DRI_USE=	LINUX_APPS=dri,libpciaccess
36
45
37
# Fixed by the first post-patch target line?  Also, linprocfs needs to be mounted.
46
# Fixed by the first post-patch target line?  Also, linprocfs needs to be mounted.
38
#.if ${OSVERSION} >= 900000 && ${ARCH} == "amd64"
47
#.if ${OSVERSION} >= 900000 && ${ARCH} == "amd64"
Lines 55-63 Link Here
55
	@${REINPLACE_CMD} -i "" -e 's|\$$SETUP_INSTALLPATH/googleearth |${PREFIX}/bin/googleearth |' ${WRKSRC}/postinstall.sh
64
	@${REINPLACE_CMD} -i "" -e 's|\$$SETUP_INSTALLPATH/googleearth |${PREFIX}/bin/googleearth |' ${WRKSRC}/postinstall.sh
56
	${RM} ${WRKSRC}/libcurl.so.4
65
	${RM} ${WRKSRC}/libcurl.so.4
57
	${PERL} -i -pe 's|/lib/ld-lsb.so.3\0\0\0|/lib/ld-linux.so.2\0|' ${WRKSRC}/googleearth-bin
66
	${PERL} -i -pe 's|/lib/ld-lsb.so.3\0\0\0|/lib/ld-linux.so.2\0|' ${WRKSRC}/googleearth-bin
58
post-patch-NVIDIA-on:
67
post-patch-LINUX_DRI-off:
59
	@${REINPLACE_CMD} 's|%%LIBGL_ALWAYS_SOFTWARE%%||' ${WRKSRC}/bin/googleearth
68
	@${REINPLACE_CMD} 's|%%LIBGL_ALWAYS_SOFTWARE%%||' ${WRKSRC}/bin/googleearth
60
post-patch-NVIDIA-off:
69
post-patch-LINUX_DRI-on:
61
	@${REINPLACE_CMD} 's|%%LIBGL_ALWAYS_SOFTWARE%%|LIBGL_ALWAYS_SOFTWARE=yes|' ${WRKSRC}/bin/googleearth
70
	@${REINPLACE_CMD} 's|%%LIBGL_ALWAYS_SOFTWARE%%|LIBGL_ALWAYS_SOFTWARE=yes|' ${WRKSRC}/bin/googleearth
62
71
63
do-build:
72
do-build:

Return to bug 201693