summaryrefslogtreecommitdiff
path: root/media-video/ffmpeg2theora/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-03-18 18:31:43 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-03-18 18:31:43 +0000
commitcd0d9000770337b445051f1852fe3971ceb7a6e2 (patch)
tree49c82dbb14c2d960e04e7482bdefe6ed2d53a173 /media-video/ffmpeg2theora/files
parent12c505f7fcc9ddc89e96ed178df05aceec162d92 (diff)
gentoo auto-resync : 18:03:2023 - 18:31:42
Diffstat (limited to 'media-video/ffmpeg2theora/files')
-rw-r--r--media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch24
-rw-r--r--media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch21
2 files changed, 0 insertions, 45 deletions
diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch
deleted file mode 100644
index b1117a87ea6f..000000000000
--- a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit a72baecd4dc7b01c0785b481460dde0fbab9a90a
-Author: Jan Gerber <j@xiph.org>
-Date: Fri Nov 23 20:21:54 2012 +0100
-
- only depend on libswresample for local branch
-
- libav does not have libswresample so its not in ubuntu.
-
-diff --git a/SConstruct b/SConstruct
-index 90520c3..01d234a 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -152,10 +152,10 @@ if not env.GetOption('clean'):
- "libavcodec >= 52.30.0",
- "libpostproc",
- "libswscale",
-- "libswresample",
- "libavutil",
- ]
- if os.path.exists("./ffmpeg"):
-+ FFMPEG_LIBS.append('libswresample')
- pkg_path = list(set(map(os.path.dirname, glob('./ffmpeg/*/*.pc'))))
- pkg_path.append(os.environ.get('PKG_CONFIG_PATH', ''))
- os.environ['PKG_CONFIG_PATH'] = ':'.join(pkg_path)
diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
deleted file mode 100644
index 791e39d87744..000000000000
--- a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-For example, pow() from mathlib is used directly in src/ffmpeg2theora.c:
-
-<snip>
-v = pow(v, g) * 255.0; // mplayer's vf_eq2.c multiplies with 256 here, strange...
-</snip>
-
-For build failure and log, see Gentoo bug #504698
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -206,9 +206,8 @@
- if env['crossmingw']:
- env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
- env.Append(LIBS=['m'])
-- elif env['static']:
-- env.Append(LIBS=['m', 'dl'])
-
-+ env.Append(LIBS=['m', 'dl'])
-
- env = conf.Finish()
-