diff options
| author | Artturi <Artturin@artturin.com> | 2024-02-14 21:32:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-14 21:32:55 +0200 |
| commit | f7e8132daca31b1e3859ac0fb49741754375ac3d (patch) | |
| tree | 5fa191d56d0060e9d10a40be71ee00b25a8b7eee | |
| parent | c2507ad16ba743d62e6b67691e7b69e06229116e (diff) | |
| parent | 0fcd5152155a13c75680c77c6e952dc9a3d7c4ac (diff) | |
Merge pull request #287300 from seanybaggins/add-mingw32-support-libtheora
Add mingw32 support libtheora
| -rw-r--r-- | pkgs/development/libraries/libtheora/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/libtheora/mingw-remove-export.patch | 18 |
2 files changed, 22 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index c61a4dc961629..45b7e4caaf1dd 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libogg, libvorbis, pkg-config, autoreconfHook, fetchpatch }: +{ lib, stdenv, fetchurl, libogg, libvorbis, pkg-config, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { pname = "libtheora"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { url = "https://github.com/xiph/theora/commit/28cc6dbd9b2a141df94f60993256a5fca368fa54.diff"; sha256 = "16jqrq4h1b3krj609vbpzd5845cvkbh3mwmjrcdg35m490p19x9k"; }) + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + ./mingw-remove-export.patch ]; configureFlags = [ "--disable-examples" ]; @@ -30,6 +32,6 @@ stdenv.mkDerivation rec { description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; maintainers = with maintainers; [ ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/development/libraries/libtheora/mingw-remove-export.patch b/pkgs/development/libraries/libtheora/mingw-remove-export.patch new file mode 100644 index 0000000000000..bf0ffc07fc439 --- /dev/null +++ b/pkgs/development/libraries/libtheora/mingw-remove-export.patch @@ -0,0 +1,18 @@ +diff --git a/win32/xmingw32/libtheoradec-all.def b/win32/xmingw32/libtheoradec-all.def +index 566eeb3..4a2e766 100644 +--- a/win32/xmingw32/libtheoradec-all.def ++++ b/win32/xmingw32/libtheoradec-all.def +@@ -1,4 +1,3 @@ +-EXPORTS + ; Old alpha API + theora_version_string @ 1 + theora_version_number @ 2 +diff --git a/win32/xmingw32/libtheoraenc-all.def b/win32/xmingw32/libtheoraenc-all.def +index 36d2dad..d1da2f4 100644 +--- a/win32/xmingw32/libtheoraenc-all.def ++++ b/win32/xmingw32/libtheoraenc-all.def +@@ -1,4 +1,3 @@ +-EXPORTS + ; Old alpha API + theora_encode_init @ 1 + theora_encode_YUVin @ 2 |