public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gamerlay:master commit in: games-util/desurium/, games-util/desurium-meta/, media-libs/desurium-cef/files/, ...
@ 2013-09-17  9:42 Sergio Perez
  0 siblings, 0 replies; only message in thread
From: Sergio Perez @ 2013-09-17  9:42 UTC (permalink / raw
  To: gentoo-commits

commit:     8486a3e34093bb9bc70780e0e3db2005e2c741fb
Author:     anagromataf <Dagobertstaler <AT> t-online <DOT> de>
AuthorDate: Tue Sep 17 09:40:42 2013 +0000
Commit:     Sergio Perez <dagobertstaler <AT> t-online <DOT> de>
CommitDate: Tue Sep 17 09:41:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=8486a3e3

[media-libs/desurium-cef] [games-util/desurium*] bump and new tinyxml2 dependency

---
 games-util/desurium-meta/desurium-meta-1.ebuild    |  41 ++++++++
 games-util/desurium/desurium-9999.ebuild           |   8 +-
 media-libs/desurium-cef/desurium-cef-5-r1.ebuild   | 110 +++++++++++++++++++++
 .../files/desurium-cef-5-nss-3.15.patch            |  54 ++++++++++
 4 files changed, 207 insertions(+), 6 deletions(-)

diff --git a/games-util/desurium-meta/desurium-meta-1.ebuild b/games-util/desurium-meta/desurium-meta-1.ebuild
new file mode 100644
index 0000000..925ca34
--- /dev/null
+++ b/games-util/desurium-meta/desurium-meta-1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Desurium game client and dependencies (meta)"
+HOMEPAGE="http://desura.com/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+32bit +games-deps"
+
+RDEPEND="
+	games-deps? (
+		dev-lang/mono[-minimal]
+		gnome-base/libglade
+		media-libs/libogg
+		media-libs/libpng:1.2
+		media-libs/libsdl[X,audio,joystick,opengl,video]
+		media-libs/libtheora
+		media-libs/libvorbis
+		media-libs/openal
+		media-libs/sdl-gfx
+		media-libs/sdl-image[gif,jpeg,png,tiff]
+		media-libs/sdl-ttf[X]
+		virtual/ffmpeg[X,mp3,sdl,theora,truetype]
+		>=virtual/jre-1.6
+		amd64? ( 32bit? (
+			app-emulation/emul-linux-x86-gtklibs
+			app-emulation/emul-linux-x86-gtkmmlibs
+			app-emulation/emul-linux-x86-medialibs
+			app-emulation/emul-linux-x86-opengl
+			app-emulation/emul-linux-x86-sdl
+			app-emulation/emul-linux-x86-soundlibs
+			app-emulation/emul-linux-x86-xlibs[opengl]
+		) )
+	)
+	games-util/desurium[32bit?]
+	media-libs/desurium-cef"

diff --git a/games-util/desurium/desurium-9999.ebuild b/games-util/desurium/desurium-9999.ebuild
index ee65565..8e14240 100644
--- a/games-util/desurium/desurium-9999.ebuild
+++ b/games-util/desurium/desurium-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 unset GIT_ECLASS
 unset WX_ECLASS
 
-GITHUB_MAINTAINER="lodle"
+GITHUB_MAINTAINER="desura"
 GITHUB_PROJECT="Desurium"
 
 # tools versions
@@ -50,11 +50,7 @@ COMMON_DEPEND="app-arch/bzip2
 	>=dev-libs/boost-1.47:=
 	dev-libs/glib:2
 	dev-libs/openssl:0
-
-	|| ( <dev-libs/tinyxml-2.6.2-r2[-stl]
-	    >=dev-libs/tinyxml-2.6.2-r2
-	)
-
+	dev-libs/tinyxml2
 	dev-lang/v8:=
 	|| (
 		net-misc/curl[adns]

diff --git a/media-libs/desurium-cef/desurium-cef-5-r1.ebuild b/media-libs/desurium-cef/desurium-cef-5-r1.ebuild
new file mode 100644
index 0000000..8c94165
--- /dev/null
+++ b/media-libs/desurium-cef/desurium-cef-5-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_6 python2_7 )
+
+unset GIT_ECLASS
+
+GITHUB_MAINTAINER="lodle"
+GITHUB_PROJECT="Desurium"
+DESURIUM_VERSION="0.8.0_rc9"
+
+# tools versions
+CEF_ARC="cef-291.tar.gz"
+CHROMIUM_ARC="chromium-15.0.876.0.tar.bz2"
+DEPOT_TOOLS_ARC="depot_tools-145556-2.tar.gz"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="git://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}.git"
+	GIT_ECLASS="git-2"
+	SRC_URI=""
+	EGIT_NOUNPACK="true"
+else
+	DESURIUM_ARC="desurium-${DESURIUM_VERSION}.tar.gz"
+	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${DESURIUM_VERSION} -> ${DESURIUM_ARC}"
+fi
+SRC_URI="${SRC_URI}
+	mirror://sourceforge/desurium/${CEF_ARC}
+	http://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_ARC}
+	mirror://sourceforge/desurium/${DEPOT_TOOLS_ARC}"
+
+inherit check-reqs cmake-utils eutils ${GIT_ECLASS} python-any-r1 games
+
+CHECKREQS_DISK_BUILD="3G"
+
+DESCRIPTION="highly patched CEF by desurium."
+HOMEPAGE="https://github.com/lodle/Desurium"
+LICENSE="BSD"
+SLOT="0"
+RESTRICT="bindist"
+
+if [[ ${PV} != 9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# wxGTK-2.9.4.1 does not work!
+COMMON_DEPEND="
+	app-arch/bzip2
+	dev-libs/dbus-glib
+	dev-libs/libevent
+	dev-libs/libxml2
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/flac
+	media-libs/libpng:0
+	media-libs/libwebp
+	media-libs/speex
+	sys-apps/dbus
+	sys-libs/zlib
+	virtual/jpeg"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="
+	dev-lang/yasm
+	dev-util/gperf
+	${COMMON_DEPEND}
+	${PYTHON_DEPS}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	games_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-2_src_unpack
+	else
+		unpack ${DESURIUM_ARC}
+		S="${WORKDIR}/$(ls ${WORKDIR})"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-nss-3.15.patch"
+}
+
+src_configure() {
+	# -DWITH_ARES=FALSE will use system curl, because we force curl[ares] to have ares support
+	local mycmakeargs=(
+		-DFORCE_SYS_DEPS=TRUE
+		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
+		-DCEF_URL="file://${DISTDIR}/${CEF_ARC}"
+		-DCHROMIUM_URL="file://${DISTDIR}/${CHROMIUM_ARC}"
+		-DDEPOT_TOOLS_URL="file://${DISTDIR}/${DEPOT_TOOLS_ARC}"
+		-DBUILD_ONLY_CEF=TRUE
+		-DRUNTIME_LIBDIR="$(games_get_libdir)"
+		-DH264_SUPPORT=TRUE
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	prepgamesdirs
+}

diff --git a/media-libs/desurium-cef/files/desurium-cef-5-nss-3.15.patch b/media-libs/desurium-cef/files/desurium-cef-5-nss-3.15.patch
new file mode 100644
index 0000000..03dd06d
--- /dev/null
+++ b/media-libs/desurium-cef/files/desurium-cef-5-nss-3.15.patch
@@ -0,0 +1,54 @@
+From 30e8bea05e5a36c061918d409f436a27b5bc7d94 Mon Sep 17 00:00:00 2001
+From: Jookia <166291@gmail.com>
+Date: Sat, 10 Aug 2013 18:33:36 +1000
+Subject: [PATCH] Fixed NSS 3.15 errors.
+
+---
+ cmake/modules/BuildCEF.cmake          |  8 ++++++++
+ cmake/patches/chromium-nss-3.15.patch | 15 +++++++++++++++
+ 2 files changed, 23 insertions(+)
+ create mode 100644 cmake/patches/chromium-nss-3.15.patch
+
+diff --git a/cmake/modules/BuildCEF.cmake b/cmake/modules/BuildCEF.cmake
+index b69c92c..7860816 100644
+--- a/cmake/modules/BuildCEF.cmake
++++ b/cmake/modules/BuildCEF.cmake
+@@ -126,6 +126,14 @@ if(BUILD_CEF OR BUILD_ONLY_CEF)
+ 
+     ExternalProject_Add_Step(
+     cef
++    nss-3-15-patch
++    COMMAND ${CMAKE_SCRIPT_PATH}/patch.sh ${CMAKE_SOURCE_DIR}/cmake/patches/chromium-nss-3.15.patch
++    DEPENDERS patch
++    WORKING_DIRECTORY ${CHROMIUM_SOURCE_DIR}/src
++    )
++
++    ExternalProject_Add_Step(
++    cef
+     config_cef
+     COMMAND ${CMAKE_SCRIPT_PATH}/depot_tools_wrapper.sh ${DEPOT_TOOLS_BIN_DIR} ./cef_create_projects.sh
+     DEPENDEES download
+diff --git a/cmake/patches/chromium-nss-3.15.patch b/cmake/patches/chromium-nss-3.15.patch
+new file mode 100644
+index 0000000..5c091f1
+--- /dev/null
++++ b/cmake/patches/chromium-nss-3.15.patch
+@@ -0,0 +1,15 @@
++--- net/base/x509_certificate_nss.cc	2013-08-10 18:15:03.643999871 +1000
+++++ net/base/x509_certificate_nss.cc	2013-08-10 18:28:45.269823335 +1000
++@@ -275,7 +275,11 @@
++ 
++ void ParsePrincipal(CERTName* name,
++                     CertPrincipal* principal) {
++-  typedef char* (*CERTGetNameFunc)(CERTName* name);
+++  #if NSS_VMINOR >= 15
+++    typedef char* (*CERTGetNameFunc)(CERTName const* name);
+++  #else
+++    typedef char* (*CERTGetNameFunc)(CERTName* name);
+++  #endif
++ 
++   // TODO(jcampan): add business_category and serial_number.
++   // TODO(wtc): NSS has the CERT_GetOrgName, CERT_GetOrgUnitName, and
+-- 
+1.8.4
+


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2013-09-17  9:42 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-17  9:42 [gentoo-commits] proj/gamerlay:master commit in: games-util/desurium/, games-util/desurium-meta/, media-libs/desurium-cef/files/, Sergio Perez

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox