[gentoo-commits] proj/gamerlay:master commit in: media-libs/sfemovie/files/, media-libs/sfemovie/

[gentoo-commits] proj/gamerlay:master commit in: media-libs/sfemovie/files/, media-libs/sfemovie/

[Marcel Unbehaun]

commit:     15615a60462cf64074c2613fa679ab29e79bca40
Author:     Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Sun Mar 25 08:02:10 2012 +0000
Commit:     Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Sun Mar 25 08:02:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=15615a60

[media-libs/sfemovie]	added sfemovie-9999.ebuild

---
 media-libs/sfemovie/files/sfemovie-install.patch |   22 ++++++++++++++++++
 media-libs/sfemovie/metadata.xml                 |   17 ++++++++++++++
 media-libs/sfemovie/sfemovie-9999.ebuild         |   26 ++++++++++++++++++++++
 3 files changed, 65 insertions(+), 0 deletions(-)

diff --git a/media-libs/sfemovie/files/sfemovie-install.patch b/media-libs/sfemovie/files/sfemovie-install.patch
new file mode 100644
index 0000000..67c3751
--- /dev/null
+++ b/media-libs/sfemovie/files/sfemovie-install.patch
@@ -0,0 +1,22 @@
+--- CMakeLists.txt	2012-03-25 09:55:13.559939721 +0200
++++ CMakeLists.txt	2012-03-25 09:46:21.000000000 +0200
+@@ -104,7 +104,7 @@
+ if (MACOSX)
+ 	set(BUILD_FRAMEWORKS 1) 
+ endif()
+-add_subdirectory("deps/SFML")
++#add_subdirectory("deps/SFML")
+ 
+ 
+ # Set the search directories for compiling and link editing
+@@ -148,3 +148,10 @@
+ # Define the libraries sfe should link against
+ target_link_libraries (${LIB_NAME} ${SFML_LIBRARIES} ${FFMPEG_LIBRARIES} ${OTHER_LIBRARIES})
+ 
++if (LINUX)
++# Installation of the library
++INSTALL(TARGETS ${LIB_NAME}
++        DESTINATION lib
++        PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
++INSTALL(FILES include/Movie.h DESTINATION include/${LIB_NAME})
++endif()

diff --git a/media-libs/sfemovie/metadata.xml b/media-libs/sfemovie/metadata.xml
new file mode 100644
index 0000000..886ba9f
--- /dev/null
+++ b/media-libs/sfemovie/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<maintainer>
+		<email>frostworks@gmx.de</email>
+		<name>Marcel Unbehaun</name>
+	</maintainer>
+	<longdescription lang="en">
+	The Simple and Fast Multimedia Library (SFML) is a portable and easy to use
+	multimedia API written in C++. You can see it as a modern, object-oriented
+	alternative to SDL. SFML is composed of several packages to suit your needs.
+	You can use SFML as a minimal windowing system to interface with OpenGL, or
+	as a fully-featured multimedia library for building games or interactive
+	programs.
+	</longdescription>
+</pkgmetadata>

diff --git a/media-libs/sfemovie/sfemovie-9999.ebuild b/media-libs/sfemovie/sfemovie-9999.ebuild
new file mode 100644
index 0000000..25f3c0e
--- /dev/null
+++ b/media-libs/sfemovie/sfemovie-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sfemovie-9999.ebuild,v 1.2 2012/03/24 13:44:53 frostwork Exp $
+
+EAPI=4
+
+inherit cmake-utils eutils git-2 multilib
+
+#MY_P="SFML-${PV}"
+DESCRIPTION="ffmpeg based movie library for SFML"
+HOMEPAGE="https://github.com/Yalir/sfeMovie"
+EGIT_REPO_URI="git://github.com/Yalir/sfeMovie.git"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="media-libs/libsfml
+	virtual/ffmpeg"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch ${FILESDIR}/"${PN}-install.patch"
+	sed -i -e "s:add_sub:#add_sub:g" -i CMakeLists.txt
+}

[gentoo-commits] proj/gamerlay:master commit in: media-libs/sfemovie/files/, media-libs/sfemovie/

[Marcel Unbehaun]

commit:     629c7b44a97de9af2ca1e347dec51ad56d6e2b0b
Author:     Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Wed Mar 28 17:14:13 2012 +0000
Commit:     Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Wed Mar 28 17:14:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=629c7b44

[media-libs/sfemovie]	updated sfemovie-9999.ebuild

---
 media-libs/sfemovie/files/sfemovie-header.patch  |   36 ++++++++++++++++++++++
 media-libs/sfemovie/files/sfemovie-install.patch |   11 +------
 media-libs/sfemovie/sfemovie-9999.ebuild         |    1 +
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/media-libs/sfemovie/files/sfemovie-header.patch b/media-libs/sfemovie/files/sfemovie-header.patch
new file mode 100644
index 0000000..db218ad
--- /dev/null
+++ b/media-libs/sfemovie/files/sfemovie-header.patch
@@ -0,0 +1,36 @@
+diff -Naur src/Movie_audio.cpp src/Movie_audio.cpp
+--- src/Movie_audio.cpp	2012-03-28 19:06:55.689955330 +0200
++++ src/Movie_audio.cpp	2012-03-28 19:09:21.959953697 +0200
+@@ -23,7 +23,7 @@
+  */
+ 
+ #include "Movie_audio.h"
+-#include "Movie.h"
++#include <sfeMovie/Movie.hpp>
+ #include <iostream>
+ #include <cassert>
+ #include "utils.h"
+diff -Naur src/Movie.cpp src/Movie.cpp
+--- src/Movie.cpp	2012-03-28 19:06:55.689955330 +0200
++++ src/Movie.cpp	2012-03-28 19:09:28.059953629 +0200
+@@ -29,7 +29,7 @@
+ #include <libswscale/swscale.h>
+ }
+ 
+-#include "Movie.h"
++#include <sfeMovie/Movie.hpp>
+ #include "Condition.h"
+ #include "Movie_video.h"
+ #include "Movie_audio.h"
+diff -Naur src/Movie_video.cpp src/Movie_video.cpp
+--- src/Movie_video.cpp	2012-03-28 19:06:55.689955330 +0200
++++ src/Movie_video.cpp	2012-03-28 19:09:12.779953801 +0200
+@@ -24,7 +24,7 @@
+ 
+ 
+ #include "Movie_video.h"
+-#include "Movie.h"
++#include <sfeMovie/Movie.hpp>
+ 
+ #include "Movie_audio.h"
+ #include <SFML/Config.hpp>

diff --git a/media-libs/sfemovie/files/sfemovie-install.patch b/media-libs/sfemovie/files/sfemovie-install.patch
index 67c3751..ddce498 100644
--- a/media-libs/sfemovie/files/sfemovie-install.patch
+++ b/media-libs/sfemovie/files/sfemovie-install.patch
@@ -1,14 +1,5 @@
 --- CMakeLists.txt	2012-03-25 09:55:13.559939721 +0200
 +++ CMakeLists.txt	2012-03-25 09:46:21.000000000 +0200
-@@ -104,7 +104,7 @@
- if (MACOSX)
- 	set(BUILD_FRAMEWORKS 1) 
- endif()
--add_subdirectory("deps/SFML")
-+#add_subdirectory("deps/SFML")
- 
- 
- # Set the search directories for compiling and link editing
 @@ -148,3 +148,10 @@
  # Define the libraries sfe should link against
  target_link_libraries (${LIB_NAME} ${SFML_LIBRARIES} ${FFMPEG_LIBRARIES} ${OTHER_LIBRARIES})
@@ -18,5 +9,5 @@
 +INSTALL(TARGETS ${LIB_NAME}
 +        DESTINATION lib
 +        PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
-+INSTALL(FILES include/Movie.h DESTINATION include/${LIB_NAME})
++INSTALL(FILES include/sfeMovie/Movie.hpp DESTINATION include/sfeMovie/)
 +endif()

diff --git a/media-libs/sfemovie/sfemovie-9999.ebuild b/media-libs/sfemovie/sfemovie-9999.ebuild
index 25f3c0e..d4664b7 100644
--- a/media-libs/sfemovie/sfemovie-9999.ebuild
+++ b/media-libs/sfemovie/sfemovie-9999.ebuild
@@ -22,5 +22,6 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch ${FILESDIR}/"${PN}-install.patch"
+	epatch ${FILESDIR}/"${PN}-header.patch"
 	sed -i -e "s:add_sub:#add_sub:g" -i CMakeLists.txt
 }

[gentoo-commits] proj/gamerlay:master commit in: media-libs/sfemovie/files/, media-libs/sfemovie/

[Marcel Unbehaun]

commit:     b0f04d6a88dd5d6133d4d118994d751a589d0d66
Author:     Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Thu Mar 29 15:04:06 2012 +0000
Commit:     Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Thu Mar 29 15:04:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=b0f04d6a

[media-libs/sfemovie]	updated sfemovie-9999.ebuild

---
 media-libs/sfemovie/files/sfemovie-header.patch |   36 -----------------------
 media-libs/sfemovie/sfemovie-9999.ebuild        |    1 -
 2 files changed, 0 insertions(+), 37 deletions(-)

diff --git a/media-libs/sfemovie/files/sfemovie-header.patch b/media-libs/sfemovie/files/sfemovie-header.patch
deleted file mode 100644
index db218ad..0000000
--- a/media-libs/sfemovie/files/sfemovie-header.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur src/Movie_audio.cpp src/Movie_audio.cpp
---- src/Movie_audio.cpp	2012-03-28 19:06:55.689955330 +0200
-+++ src/Movie_audio.cpp	2012-03-28 19:09:21.959953697 +0200
-@@ -23,7 +23,7 @@
-  */
- 
- #include "Movie_audio.h"
--#include "Movie.h"
-+#include <sfeMovie/Movie.hpp>
- #include <iostream>
- #include <cassert>
- #include "utils.h"
-diff -Naur src/Movie.cpp src/Movie.cpp
---- src/Movie.cpp	2012-03-28 19:06:55.689955330 +0200
-+++ src/Movie.cpp	2012-03-28 19:09:28.059953629 +0200
-@@ -29,7 +29,7 @@
- #include <libswscale/swscale.h>
- }
- 
--#include "Movie.h"
-+#include <sfeMovie/Movie.hpp>
- #include "Condition.h"
- #include "Movie_video.h"
- #include "Movie_audio.h"
-diff -Naur src/Movie_video.cpp src/Movie_video.cpp
---- src/Movie_video.cpp	2012-03-28 19:06:55.689955330 +0200
-+++ src/Movie_video.cpp	2012-03-28 19:09:12.779953801 +0200
-@@ -24,7 +24,7 @@
- 
- 
- #include "Movie_video.h"
--#include "Movie.h"
-+#include <sfeMovie/Movie.hpp>
- 
- #include "Movie_audio.h"
- #include <SFML/Config.hpp>

diff --git a/media-libs/sfemovie/sfemovie-9999.ebuild b/media-libs/sfemovie/sfemovie-9999.ebuild
index d4664b7..25f3c0e 100644
--- a/media-libs/sfemovie/sfemovie-9999.ebuild
+++ b/media-libs/sfemovie/sfemovie-9999.ebuild
@@ -22,6 +22,5 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch ${FILESDIR}/"${PN}-install.patch"
-	epatch ${FILESDIR}/"${PN}-header.patch"
 	sed -i -e "s:add_sub:#add_sub:g" -i CMakeLists.txt
 }

[gentoo-commits] proj/gamerlay:master commit in: media-libs/sfemovie/files/, media-libs/sfemovie/

[Marcel Unbehaun]

commit:     d11bf06b5be3633fa479fde4acf826b5f2408266
Author:     Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Thu Jul  5 15:25:43 2012 +0000
Commit:     Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Thu Jul  5 15:25:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=d11bf06b

[media-libs/sfemovie]	updated sfemovie-9999.ebuild

---
 media-libs/sfemovie/files/sfemovie-install.patch |   18 ------------------
 media-libs/sfemovie/sfemovie-9999.ebuild         |    1 -
 2 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/media-libs/sfemovie/files/sfemovie-install.patch b/media-libs/sfemovie/files/sfemovie-install.patch
deleted file mode 100644
index e5d1526..0000000
--- a/media-libs/sfemovie/files/sfemovie-install.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- CMakeLists.txt-o	2012-06-20 16:21:51.000000000 +0200
-+++ CMakeLists.txt	2012-06-20 16:23:44.280765606 +0200
-@@ -153,12 +153,11 @@
- 
- 
- if (LINUX)
--	install(DIRECTORY product/include/sfeMovie
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/include
-+	INSTALL(FILES include/sfeMovie/Movie.hpp DESTINATION include/sfeMovie/
-             COMPONENT devel)
-             
--    install(DIRECTORY product/lib
--            DESTINATION ${CMAKE_INSTALL_PREFIX}
-+    INSTALL(TARGETS ${LIB_NAME}
-+			DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-             COMPONENT devel)
- elseif (MACOSX)
-     # edit target properties

diff --git a/media-libs/sfemovie/sfemovie-9999.ebuild b/media-libs/sfemovie/sfemovie-9999.ebuild
index 25f3c0e..4cc89e2 100644
--- a/media-libs/sfemovie/sfemovie-9999.ebuild
+++ b/media-libs/sfemovie/sfemovie-9999.ebuild
@@ -21,6 +21,5 @@ DEPEND="media-libs/libsfml
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch ${FILESDIR}/"${PN}-install.patch"
 	sed -i -e "s:add_sub:#add_sub:g" -i CMakeLists.txt
 }