summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-04-29 23:20:19 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-04-29 23:20:19 +0000
commit4b43863ce0a7e4633f5a7d326a39ef2d3808bac9 (patch)
tree6cb9bdfd8ccd74c9b14551689152534e98a7e846 /dev-games
parentFix manifest. (diff)
downloadhistorical-4b43863ce0a7e4633f5a7d326a39ef2d3808bac9.tar.gz
historical-4b43863ce0a7e4633f5a7d326a39ef2d3808bac9.tar.bz2
historical-4b43863ce0a7e4633f5a7d326a39ef2d3808bac9.zip
fix build with mesa-10.x wrt #496356
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xBDEED020
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/irrlicht/ChangeLog9
-rw-r--r--dev-games/irrlicht/Manifest30
-rw-r--r--dev-games/irrlicht/files/irrlicht-1.8-mesa-10.x.patch40
-rw-r--r--dev-games/irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch40
-rw-r--r--dev-games/irrlicht/irrlicht-1.8-r2.ebuild7
-rw-r--r--dev-games/irrlicht/irrlicht-1.8.1.ebuild7
6 files changed, 115 insertions, 18 deletions
diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index 9bdd2b1ea195..8c5f2ff066e1 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-games/irrlicht
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.69 2013/11/21 21:44:14 hasufell Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.70 2014/04/29 23:20:15 hasufell Exp $
+
+ 29 Apr 2014; Julian Ospald <hasufell@gentoo.org> irrlicht-1.8-r2.ebuild,
+ irrlicht-1.8.1.ebuild, +files/irrlicht-1.8-mesa-10.x.patch,
+ +files/irrlicht-1.8.1-mesa-10.x.patch:
+ fix build with mesa-10.x wrt #496356
*irrlicht-1.8.1 (21 Nov 2013)
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index 09b391db0141..a34f6a6ef093 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -3,24 +3,34 @@ Hash: SHA256
AUX irrlicht-1.8-config.patch 1302 SHA256 34e1b4184cb499ef8d245b8f97e8a4e8cd88f03f4eecddeff661c97a44f24ab2 SHA512 3c08639425517af9e0dcad919b80ce049e42ded399bf81354f824c425e4355c033b4574f0e76a926cbccc471b06e80ac73ae94232fa1db2b3d2f7da3fa5a840d WHIRLPOOL e9d2f51fc9665826170123daab4d1d4691e6740d2ce92d676ccb18df432ce7c3dfa2a2134b2543cb42968d1a0acfe97c1ac4a775c460c93cf7ac46865b68a633
AUX irrlicht-1.8-demoMake.patch 27382 SHA256 e8d5ee8145f4bda5ee2ff78b9300a2f47e1c287481cbc490a382e74813fcea61 SHA512 72ef258a578620c2b927ca258b105e25fd96971a63d82715a3a68363aa335c0ff6bf0e983c6b1385a6fd9c9c1505e9472970cd3c3b48c2c592d6ca09f897971f WHIRLPOOL c1e4f4419dcae706e5c9189672505b8572ed813eaa4efed2a6f82c89d59d1d2d9777fbd5f0e1904cce7c955db8f924ef1da873cc0621be88167191d2fea7227b
+AUX irrlicht-1.8-mesa-10.x.patch 1394 SHA256 d17e8084cb5b458aef85a136b6366e07e615b8dcca18fd7f66a988886d7ab750 SHA512 44c16419c07597ba6d06d66057fbe2ab86e7b02b5dcdf458678b4ea87f6f721840da951ae4df59c983e1da83abdbe45f82e44a6a311bd42eb94d93dfd5aa437c WHIRLPOOL b8f537dc83460b5f4e40a4296a5c6f9be8fa1f2d771425d582fa6374646eb11c8642cb8ab5af551d9c9d7602dc05ca37386c26ec7e83089bbf30e205aa53a5b2
AUX irrlicht-1.8-r2-gentoo.patch 3813 SHA256 e1ea240dc0746036cff6e6f151389f650d8b4425e3a91fed5383200f51c86475 SHA512 b2ac774f6b2079158d94e5c13c831b7f53fbce3953684ae3d797fbfb3d313b2d35fefee807daea8aa24374ddb47bbd2fa65577982b9a9123178f50561ea1d8de WHIRLPOOL b9f2c2db21aeaf59714ea91578a702e7cc8beb6ddef3d6a20dfaaec44fccd06638ac854b72a2b6fcb52f11213dffb8c610e7ef4f7b3f0f1f513aa27f00bcfbe5
AUX irrlicht-1.8.1-config.patch 1302 SHA256 34e1b4184cb499ef8d245b8f97e8a4e8cd88f03f4eecddeff661c97a44f24ab2 SHA512 3c08639425517af9e0dcad919b80ce049e42ded399bf81354f824c425e4355c033b4574f0e76a926cbccc471b06e80ac73ae94232fa1db2b3d2f7da3fa5a840d WHIRLPOOL e9d2f51fc9665826170123daab4d1d4691e6740d2ce92d676ccb18df432ce7c3dfa2a2134b2543cb42968d1a0acfe97c1ac4a775c460c93cf7ac46865b68a633
AUX irrlicht-1.8.1-demoMake.patch 27382 SHA256 e8d5ee8145f4bda5ee2ff78b9300a2f47e1c287481cbc490a382e74813fcea61 SHA512 72ef258a578620c2b927ca258b105e25fd96971a63d82715a3a68363aa335c0ff6bf0e983c6b1385a6fd9c9c1505e9472970cd3c3b48c2c592d6ca09f897971f WHIRLPOOL c1e4f4419dcae706e5c9189672505b8572ed813eaa4efed2a6f82c89d59d1d2d9777fbd5f0e1904cce7c955db8f924ef1da873cc0621be88167191d2fea7227b
AUX irrlicht-1.8.1-gentoo.patch 3813 SHA256 e1ea240dc0746036cff6e6f151389f650d8b4425e3a91fed5383200f51c86475 SHA512 b2ac774f6b2079158d94e5c13c831b7f53fbce3953684ae3d797fbfb3d313b2d35fefee807daea8aa24374ddb47bbd2fa65577982b9a9123178f50561ea1d8de WHIRLPOOL b9f2c2db21aeaf59714ea91578a702e7cc8beb6ddef3d6a20dfaaec44fccd06638ac854b72a2b6fcb52f11213dffb8c610e7ef4f7b3f0f1f513aa27f00bcfbe5
+AUX irrlicht-1.8.1-mesa-10.x.patch 1394 SHA256 d17e8084cb5b458aef85a136b6366e07e615b8dcca18fd7f66a988886d7ab750 SHA512 44c16419c07597ba6d06d66057fbe2ab86e7b02b5dcdf458678b4ea87f6f721840da951ae4df59c983e1da83abdbe45f82e44a6a311bd42eb94d93dfd5aa437c WHIRLPOOL b8f537dc83460b5f4e40a4296a5c6f9be8fa1f2d771425d582fa6374646eb11c8642cb8ab5af551d9c9d7602dc05ca37386c26ec7e83089bbf30e205aa53a5b2
DIST irrlicht-1.8.1.zip 24167636 SHA256 0cea383ffc04cfbf9e59080b6e01a70416f78f80c205261eaff11fcc57e0832f SHA512 0166afa50ca4a033a4e40f798e6cc206663d78a050ae6103b3b54287be9ad370e9547d4da7a155eda5941fe6beb897193dcdaa5ba599e766531f51ad3b2e7a7c WHIRLPOOL 5150a08fe431b7d2e38138ffd74810986efc23c30120337f636c18e4f760603c687a062644a7aa8177d91fa4ef937e4f965453255de056a15752fc824d81da56
DIST irrlicht-1.8.zip 23674513 SHA256 f8756c3cf83f16f41eb1eca8f4ebb530f0e8fd572443905e3d8eb8f09445a642 SHA512 07aa6e49252f073e352fbd715b77d171b6d25d22e6b0faccaf7328b28693e6851f37498cfb4094f7b09d122170c491571431bf8f698828e82c2aa9d7ff792af7 WHIRLPOOL b021cc06fb216a9add40ad70beac22f41f2902f0b053713491c80057c04f05f9f45e19c282c109850235d7db89675ffaa7f5170b0b83f2b8918a0915ee43837d
-EBUILD irrlicht-1.8-r2.ebuild 1659 SHA256 7e4ca40edf456e9dd70f7a51ad41b8729704fb96232eddab5a981097e7ce53b6 SHA512 ad03a0765d1ded84d69ec6768783a25e5ec319f9f00261441631f69baae034f0fe4ab22c1c142b00119c4237425bbe0f033bc27ffbb2ecf0c2cd2f19638527d1 WHIRLPOOL 4f3eb88e82f75f87d18a80c2116faa85addd3335184a42d6454b3f4dcb03548527c28bdc4daad9bd6fdc0fc2d85197c9ecd7d34b072ff829acd3d966126bd743
-EBUILD irrlicht-1.8.1.ebuild 1661 SHA256 be185d35d1b6cbb4290374aef83554a466b52a61d9a40d2617d32bde7bb1050a SHA512 0e0ddc03deafefc084f8e885c0fc5186b1d380ebd1f0569dd3582c12b748e1dd1faaf4fadb0d54b81c825d3f49d0ca9fb3408a1847b82c9a785ade640c64fd91 WHIRLPOOL df1a2dffb398a3746b7814b3ea1b8851ab3b97e4f46651e0c9ea5f5360e4948add26328b24278dd74274946a7db4c6c955364b7c69e98fd7692a5d33489776d2
-MISC ChangeLog 11313 SHA256 629733dd528a4fed717091bc77fdba77fed9ba628ce5bdbc7b4699230f5040d6 SHA512 e240c7ba2a0376446807c1de6814fe80363310743e42857ecc568385d2c7c68fe5ff06cea75c075156c1d9b3dd4ae51ba0957fb7d731b72e967ae8b1835d7a61 WHIRLPOOL a87d59a4a8fa6ca402eb80f02176c855b5cf32ca457461f84fbefcb8c25650a022555ac77509cba39544b7546cbd9c193b21b4f477197d66b35263f5ade8e9d2
+EBUILD irrlicht-1.8-r2.ebuild 1699 SHA256 dce194f582723f8372d6740e0327ae216869b92b2ec329c5632e16739e05a17b SHA512 3ae08a547a1fe075460ffefb5714f1e4ea3e38b711c4227a51a17c1c815af8874d5099d4d3a9e88db4946fa0b88c5ec6525985cadee82519b42cae90acb81df5 WHIRLPOOL 894f333bf41c5f7d3959e0d823c52405e5302c7ca05ea24a71950a8e06ad7073e7adf57353b0668d2929632f229dc2e0ff50ba853520f27ec7a6e8a5f39c6cbe
+EBUILD irrlicht-1.8.1.ebuild 1700 SHA256 20fbcc0f9fb720712a10b3bf04a21d8feb4f252d18b0728ac25529089bf35d71 SHA512 323a531787b55c45d03f42a4a4d37f93cc526df91cd795fea60fcfabff88062fc30085c4dada296351f5de98abb5ba041cfcebcf15e7fed8af2b4d18bf27f94f WHIRLPOOL a2f9210eee25d5d8070c17f6e23f7e2f9a5863afa1061e7ab404d6532af4634d4a014be8195ddd34b8b15511a38afaea7c2df940c1ba1fbe3ddea634617395a4
+MISC ChangeLog 11531 SHA256 73d247b62370b4fcfd4370e32f911337d9e9c4fa2531d6d5da4219387cfbe571 SHA512 1e77c8e7697ccef8c9c4509071d8787fa58dbb7bec59d5098e247709284a2bbd7b19d9eb9d69fb7fc936284aa4d12029912357f3ec550780aa48864c6bd56887 WHIRLPOOL d772094d77f1ff0c4bd1d0fb7abf9628a5cbf6e5665aacf08d4d8e81bd193d3d6e056aead5805fd54b6c60e2ee3833cb2c8113276c02e4e53dbd607639d50acd
MISC metadata.xml 790 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc SHA512 d4006cf3f5afcb96934d074360aaa49e35249ecf346965bd170704947ae6a194ef6daa8f4bff7cf473bbbab4f658f978a5398e3a1efda8ce034314637903719a WHIRLPOOL 6cc67212be3a7109e97e0fa471f83ea6d73e01d5ac49f45e62b89d6dbd28d2e861d4179a22f5a7ac53fe0835c7b9d92d2d22c56e9b07a8ac72b189db1e318d0b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQEcBAEBCAAGBQJSjn6xAAoJEFpvPKfnPDWzpkwH/1NQB2rfyC9O97QC0m7j+cgj
-PYwuEDBFQ87RK0pLGMM9PzgXLnRBrFXQWd27ZDvb6QtA64CIT74fcE/MyBSchAV/
-jQ92+pyGrC+r1VF79jcURiDRGQUkYlTdbhAMDgKEUusy9PGd9mYNNylQyAty2hNX
-B58+5Lui2ccQOTcmOIFX+1IQvN2BjMJDV1mPtSWPbng3TCwj5NVWW9TDJ3ib6KuC
-38qBzdkcb8UKb42yAhLN33QDyZh3rpXXqk+1DZAcIU8uIy9sJOL5SV1YGYlDE/pg
-Dbu07JAEoJ3e3VqwswOC4lemLjOIJdG9cZURznG8ADd3D8uw2zQ26uWD/bYujaY=
-=0Dg/
+iQJ8BAEBCABmBQJTYDOyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgVAAQALyXD6PRb4IUbV4M1CfuHE3Y
+MFmL8Dn2AC67HzcnQVP1LRBxwM6OHk+azwinelRNFyXq6iwftOVTKuquxZScX4Hu
+4zpmL0x0Tzy92ut8B25T0GXZmFZ5vAsY3EChTkt9X/ALUCfA5sbZOG7UzAqpCQ5c
+XKrd8OOZ4H+K0ccxm8wx4nrBIGVx8hQ6erhyVrd6Dp2w/NCYy+MM4vTfBBwkiUdm
+8sstAydOgPW0gkVetU64VJRYzN+aAchn62jX9zoVYQfCYD5VRCPPzYEGaJxaNGj5
+E1zbLwdnCg4hdjr2y/qAYaf8wEaVpkX24GXRqdk3kqllTN+wvFjk/5rEZT2IOE39
+UzjhOlqj0CakBuNB8UjDCLox55XFO/72r6UmnX5/txcI6qSHi0LpRZu07Yox9DA6
+RCqLtYuE9k2FUz4R5dF/txx4xxxK4oY8okKB5HZYLBRfWL/MWSL3qVobTGeCQODV
+eGHoBkBHubPH+kOqaBEhegHDGCwreyvF0VsOE22T2Rz2VRpoNCRe0sCFYD4qpa1Q
+4QEjNRqG4+jsQM0iAfK/kmZUilaMQShqVj4+8MLw2YuvqRmh2ajfveZYCcIbxUKt
+p0ZLpmQAow0E4FMWt8Yhsfy4LA6xUqECCNegXmayMW6xNNBC7MgcSNCvAxoKEteB
+7R3zIVs081I//LQKAozT
+=XD2L
-----END PGP SIGNATURE-----
diff --git a/dev-games/irrlicht/files/irrlicht-1.8-mesa-10.x.patch b/dev-games/irrlicht/files/irrlicht-1.8-mesa-10.x.patch
new file mode 100644
index 000000000000..e90ff36443a0
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8-mesa-10.x.patch
@@ -0,0 +1,40 @@
+From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001
+From: hiker <henrichsjoerg@mgail.com>
+Date: Wed, 26 Feb 2014 11:13:03 +1100
+Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation
+ problems.
+
+--- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
++++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
+@@ -21,6 +21,7 @@
+ #endif
+ #include <GL/gl.h>
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ #include "glext.h"
+ #endif
+ #include "wglext.h"
+@@ -35,6 +36,7 @@
+ #endif
+ #include <OpenGL/gl.h>
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ #include "glext.h"
+ #endif
+ #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+@@ -48,6 +50,7 @@
+ #define NO_SDL_GLEXT
+ #include <SDL/SDL_video.h>
+ #include <SDL/SDL_opengl.h>
++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ #include "glext.h"
+ #else
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+@@ -60,6 +63,7 @@
+ #include <GL/gl.h>
+ #include <GL/glx.h>
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ #include "glext.h"
+ #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
+ #include "glxext.h"
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch
new file mode 100644
index 000000000000..e90ff36443a0
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch
@@ -0,0 +1,40 @@
+From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001
+From: hiker <henrichsjoerg@mgail.com>
+Date: Wed, 26 Feb 2014 11:13:03 +1100
+Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation
+ problems.
+
+--- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
++++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
+@@ -21,6 +21,7 @@
+ #endif
+ #include <GL/gl.h>
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ #include "glext.h"
+ #endif
+ #include "wglext.h"
+@@ -35,6 +36,7 @@
+ #endif
+ #include <OpenGL/gl.h>
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ #include "glext.h"
+ #endif
+ #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+@@ -48,6 +50,7 @@
+ #define NO_SDL_GLEXT
+ #include <SDL/SDL_video.h>
+ #include <SDL/SDL_opengl.h>
++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ #include "glext.h"
+ #else
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+@@ -60,6 +63,7 @@
+ #include <GL/gl.h>
+ #include <GL/glx.h>
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ #include "glext.h"
+ #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
+ #include "glxext.h"
diff --git a/dev-games/irrlicht/irrlicht-1.8-r2.ebuild b/dev-games/irrlicht/irrlicht-1.8-r2.ebuild
index fb235fdd5abb..003f0d045431 100644
--- a/dev-games/irrlicht/irrlicht-1.8-r2.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.8-r2.ebuild,v 1.5 2013/03/08 00:00:45 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.8-r2.ebuild,v 1.6 2014/04/29 23:20:15 hasufell Exp $
EAPI=5
inherit eutils multilib toolchain-funcs
@@ -35,7 +35,8 @@ src_prepare() {
epatch \
"${FILESDIR}"/${PF}-gentoo.patch \
"${FILESDIR}"/${P}-config.patch \
- "${FILESDIR}"/${P}-demoMake.patch
+ "${FILESDIR}"/${P}-demoMake.patch \
+ "${FILESDIR}"/${P}-mesa-10.x.patch
sed -i \
-e 's:\.\./\.\./media:../media:g' \
diff --git a/dev-games/irrlicht/irrlicht-1.8.1.ebuild b/dev-games/irrlicht/irrlicht-1.8.1.ebuild
index 5b17c8fd31ee..87fcacef0998 100644
--- a/dev-games/irrlicht/irrlicht-1.8.1.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.8.1.ebuild,v 1.1 2013/11/21 21:44:14 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.8.1.ebuild,v 1.2 2014/04/29 23:20:15 hasufell Exp $
EAPI=5
inherit eutils multilib toolchain-funcs
@@ -35,7 +35,8 @@ src_prepare() {
epatch \
"${FILESDIR}"/${P}-gentoo.patch \
"${FILESDIR}"/${P}-config.patch \
- "${FILESDIR}"/${P}-demoMake.patch
+ "${FILESDIR}"/${P}-demoMake.patch \
+ "${FILESDIR}"/${P}-mesa-10.x.patch
sed -i \
-e 's:\.\./\.\./media:../media:g' \