diff options
| author | Vlad Glagolev | 2016-03-24 21:54:51 -0400 |
|---|---|---|
| committer | Vlad Glagolev | 2016-03-24 21:54:51 -0400 |
| commit | 6e20dce0c152787e1f657fb4f5b4db535cb7cb0c (patch) | |
| tree | 7f4fe86c476aa7bbb55584ae3a294f13be3d1c2d | |
| parent | 3d657c15352e2477dd23a7a1d453e3dce20353b2 (diff) | |
palemoon: fixed build with WebM and added missing dependencies for H.264
| -rwxr-xr-x | http/palemoon/DEPENDS | 8 | ||||
| -rw-r--r-- | http/palemoon/HISTORY | 5 | ||||
| -rwxr-xr-x | http/palemoon/PRE_BUILD | 2 | ||||
| -rw-r--r-- | http/palemoon/libvpx.patch | 24 |
4 files changed, 38 insertions, 1 deletions
diff --git a/http/palemoon/DEPENDS b/http/palemoon/DEPENDS index 99e3bf6e14..853155928d 100755 --- a/http/palemoon/DEPENDS +++ b/http/palemoon/DEPENDS @@ -63,7 +63,13 @@ optional_depends gstreamer \ "for GStreamer support" && if is_depends_enabled $SPELL gstreamer; then - depends gst-plugins-base + depends gst-plugins-base && + # qtdemux + depends gst-plugins-good && + # h264parse + depends gst-plugins-bad && + # ffmpeg plugin for gstreamer + depends gst-ffmpeg fi && optional_depends dbus \ diff --git a/http/palemoon/HISTORY b/http/palemoon/HISTORY index 99ca6f6254..8c1b446294 100644 --- a/http/palemoon/HISTORY +++ b/http/palemoon/HISTORY @@ -1,3 +1,8 @@ +2016-03-24 Vlad Glagolev <stealth@sourcemage.org> + * DEPENDS: added missing dependencies for H.264 support + * PRE_BUILD: apply patch + * libvpx.patch: added, to fix build with webm support + 2016-02-27 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 26.1.1 * DEPENDS: added configure flag and comment about system nss diff --git a/http/palemoon/PRE_BUILD b/http/palemoon/PRE_BUILD index 4d8a31389b..4e66c2b33f 100755 --- a/http/palemoon/PRE_BUILD +++ b/http/palemoon/PRE_BUILD @@ -4,6 +4,8 @@ verify_file && 7z x "${SOURCE_CACHE}/${SOURCE}" > /dev/null && +patch -p0 < "${SPELL_DIRECTORY}/libvpx.patch" && + # resurrect permissions not stored by 7zip find . -type d -exec chmod 755 '{}' \; && find . -type f -exec chmod 644 '{}' \; && diff --git a/http/palemoon/libvpx.patch b/http/palemoon/libvpx.patch new file mode 100644 index 0000000000..ef853f028d --- /dev/null +++ b/http/palemoon/libvpx.patch @@ -0,0 +1,24 @@ +--- media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.orig ++++ media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc +@@ -178,7 +178,7 @@ + // Creating a wrapper to the image - setting image data to NULL. Actual + // pointer will be set in encode. Setting align to 1, as it is meaningless + // (actual memory is not allocated). +- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height, ++ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height, + 1, NULL); + // populate encoder configuration with default values + if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) { +@@ -352,9 +352,9 @@ + } + // Image in vpx_image_t format. + // Input image is const. VP8's raw image is not defined as const. +- raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane)); +- raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane)); +- raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane)); ++ raw_->planes[VPX_PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane)); ++ raw_->planes[VPX_PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane)); ++ raw_->planes[VPX_PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane)); + // TODO(mikhal): Stride should be set in initialization. + raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane); + raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane); |