From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SCwSS-0003Nk-UC for garchives@archives.gentoo.org; Wed, 28 Mar 2012 17:14:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73960E0E85; Wed, 28 Mar 2012 17:14:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 34A13E0E85 for ; Wed, 28 Mar 2012 17:14:34 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6656D1B400C for ; Wed, 28 Mar 2012 17:14:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1F5E7E5402 for ; Wed, 28 Mar 2012 17:14:32 +0000 (UTC) From: "Marcel Unbehaun" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marcel Unbehaun" Message-ID: <1332954853.629c7b44a97de9af2ca1e347dec51ad56d6e2b0b.frostwork@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: media-libs/sfemovie/files/, media-libs/sfemovie/ X-VCS-Repository: proj/gamerlay X-VCS-Files: media-libs/sfemovie/files/sfemovie-header.patch media-libs/sfemovie/files/sfemovie-install.patch media-libs/sfemovie/sfemovie-9999.ebuild X-VCS-Directories: media-libs/sfemovie/files/ media-libs/sfemovie/ X-VCS-Committer: frostwork X-VCS-Committer-Name: Marcel Unbehaun X-VCS-Revision: 629c7b44a97de9af2ca1e347dec51ad56d6e2b0b X-VCS-Branch: master Date: Wed, 28 Mar 2012 17:14:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6a410bba-2742-416c-9243-0017c424c55c X-Archives-Hash: 723a255f25c379fe2043b8246634d6dc commit: 629c7b44a97de9af2ca1e347dec51ad56d6e2b0b Author: Marcel Unbehaun frostworx de> AuthorDate: Wed Mar 28 17:14:13 2012 +0000 Commit: Marcel Unbehaun gmx de> CommitDate: Wed Mar 28 17:14:13 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gamerlay.git;= a=3Dcommit;h=3D629c7b44 [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 @@ + */ +=20 + #include "Movie_audio.h" +-#include "Movie.h" ++#include + #include + #include + #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 + } +=20 +-#include "Movie.h" ++#include + #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 @@ +=20 +=20 + #include "Movie_video.h" +-#include "Movie.h" ++#include +=20 + #include "Movie_audio.h" + #include diff --git a/media-libs/sfemovie/files/sfemovie-install.patch b/media-lib= s/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)=20 - endif() --add_subdirectory("deps/SFML") -+#add_subdirectory("deps/SFML") -=20 -=20 - # 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/sfemov= ie/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=3D"${DEPEND}" =20 src_prepare() { epatch ${FILESDIR}/"${PN}-install.patch" + epatch ${FILESDIR}/"${PN}-header.patch" sed -i -e "s:add_sub:#add_sub:g" -i CMakeLists.txt }