public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Marcel Unbehaun" <frostworks@gmx.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gamerlay:master commit in: media-libs/sfemovie/files/, media-libs/sfemovie/
Date: Thu, 29 Mar 2012 15:04:21 +0000 (UTC)	[thread overview]
Message-ID: <1333033446.b0f04d6a88dd5d6133d4d118994d751a589d0d66.frostwork@gentoo> (raw)

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
 }



             reply	other threads:[~2012-03-29 15:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-29 15:04 Marcel Unbehaun [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-07-05 15:23 [gentoo-commits] proj/gamerlay:master commit in: media-libs/sfemovie/files/, media-libs/sfemovie/ Marcel Unbehaun
2012-03-28 17:14 Marcel Unbehaun
2012-03-25  8:59 Marcel Unbehaun

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1333033446.b0f04d6a88dd5d6133d4d118994d751a589d0d66.frostwork@gentoo \
    --to=frostworks@gmx.de \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox