Merge pull request #105216 from prusnak/smpeg2

smpeg2: 412 -> unstable-2017-10-18
This commit is contained in:
Sandro 2020-12-11 08:59:46 +01:00 committed by GitHub
commit 998653ad85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 33 deletions

View File

@ -1,21 +1,28 @@
{ stdenv, darwin, fetchsvn, autoconf, automake, pkgconfig, makeWrapper, SDL2 }: { stdenv
, autoconf
, automake
, darwin
, fetchsvn
, makeWrapper
, pkg-config
, SDL2
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "smpeg2-svn${version}"; pname = "smpeg2";
version = "412"; version = "unstable-2017-10-18";
src = fetchsvn { src = fetchsvn {
url = "svn://svn.icculus.org/smpeg/trunk"; url = "svn://svn.icculus.org/smpeg/trunk";
rev = version; rev = "413";
sha256 = "1irf2d8f150j8cx8lbb0pz1rijap536crsz0mw871xrh6wd2fd96"; sha256 = "193amdwgxkb1zp7pgr72fvrdhcg3ly72qpixfxxm85rzz8g2kr77";
}; };
patches = [ patches = [
./gcc6.patch ./hufftable-uint_max.patch
./sdl2.patch
]; ];
nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ]; nativeBuildInputs = [ autoconf automake makeWrapper pkg-config ];
buildInputs = [ SDL2 ] buildInputs = [ SDL2 ]
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
@ -25,10 +32,8 @@ stdenv.mkDerivation rec {
''; '';
postInstall = '' postInstall = ''
sed -e 's,#include "\(SDL.*.h\)",#include <SDL2/\1>,' -i $out/include/smpeg2/*.h
wrapProgram $out/bin/smpeg2-config \ wrapProgram $out/bin/smpeg2-config \
--prefix PATH ":" "${pkgconfig}/bin" \ --prefix PATH ":" "${pkg-config}/bin" \
--prefix PKG_CONFIG_PATH ":" "${SDL2.dev}/lib/pkgconfig" --prefix PKG_CONFIG_PATH ":" "${SDL2.dev}/lib/pkgconfig"
''; '';

View File

@ -1,22 +0,0 @@
diff --git a/smpeg2-config.in b/smpeg2-config.in
index 5cce954..0e61939 100644
--- a/smpeg2-config.in
+++ b/smpeg2-config.in
@@ -42,7 +42,7 @@ while test $# -gt 0; do
if test @includedir@ != /usr/include ; then
includes=-I@includedir@
fi
- echo $includes -I@includedir@/smpeg2 `@SDL_CONFIG@ --cflags`
+ echo $includes -I@includedir@/smpeg2 `@SDL2_CONFIG@ --cflags`
;;
--libs)
if [ "`uname`" = "SunOS" ]; then
@@ -50,7 +50,7 @@ while test $# -gt 0; do
else
libdirs="-L@libdir@ @SMPEG_RLD_FLAGS@"
fi
- echo $libdirs -lsmpeg2 `@SDL_CONFIG@ --libs`
+ echo $libdirs -lsmpeg2 `@SDL2_CONFIG@ --libs`
;;
*)
echo "${usage}" 1>&2