#1194: always bundle ogg and mpeg4 container support on osx and win32

git-svn-id: https://xpra.org/svn/Xpra/trunk@12574 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · May 13, 2016 · 27aed7d · 27aed7d
1 parent b073012
commit 27aed7d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/osx/make-app.sh b/osx/make-app.sh
@@ -235,7 +235,7 @@ for GST_VERSION in "0.10" "1.0"; do
 	if [ "$STRIP_GSTREAMER_PLUGINS" == "1" ]; then
 		KEEP="./gstreamer-$GST_VERSION.keep"
 		mkdir ${KEEP}
-		PLUGINS="app audio coreelements faac faad flac ogg oss osxaudio speex gdp volume vorbis wav lame mad opus"
+		PLUGINS="app audio coreelements faac faad flac oss osxaudio speex volume vorbis wav lame mad opus ogg gdp isomp4 matroska"
 		if [ $GST_VERSION == "0.10" ]; then
 			#only found in 0.10:
 			PLUGINS="$PLUGINS mpegaudioparse python"

diff --git a/src/setup.py b/src/setup.py
@@ -1336,12 +1336,15 @@ def do_add_DLLs(*dll_names):
                           ):
                     add_DLLs('gst%s' % p)
                 #add the gstreamer plugins we need:
-                GST_PLUGINS = ("app", "gdp", "matroska"
+                GST_PLUGINS = ("app",
+                               #muxers:
+                               "gdp", "matroska", "ogg", "isomp4",
                                "audioparsers", "audiorate", "audioconvert", "audioresample", "audiotestsrc",
                                "coreelements", "directsoundsink", "directsoundsrc",
-                               "opus", "flac", "lame", "mad", "mpg123", "ogg", "speex",
+                               #codecs:
+                               "opus", "flac", "lame", "mad", "mpg123", "speex", "faac", "faad",
                                "volume", "vorbis", "wavenc", "wavpack", "wavparse",
-                               #a52dec, faac, faad, voaacenc
+                               #untested: a52dec, voaacenc
                                )
                 add_dir(os.path.join("lib", "gstreamer-1.0"), [("libgst%s.dll" % x) for x in GST_PLUGINS])
                 #END OF SOUND