Skip to content

Instantly share code, notes, and snippets.

@starius
Created December 30, 2016 19:08
Show Gist options
  • Select an option

  • Save starius/65ffc0ad1b9b1839ea6b2b3a5f787669 to your computer and use it in GitHub Desktop.

Select an option

Save starius/65ffc0ad1b9b1839ea6b2b3a5f787669 to your computer and use it in GitHub Desktop.
From 47082bb66cd8e20cdb9d1ea13e22c216618e2afa Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Fri, 30 Dec 2016 20:00:48 +0100
Subject: [PATCH] gst-plugins-bad: depend on neon and fix its header
fix https://github.com/mxe/mxe/issues/1619
---
src/gst-plugins-bad-1-fixes.patch | 41 +++++++++++++++++++++++++++++++++++++
src/gst-plugins-bad.mk | 2 +-
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 src/gst-plugins-bad-1-fixes.patch
diff --git a/src/gst-plugins-bad-1-fixes.patch b/src/gst-plugins-bad-1-fixes.patch
new file mode 100644
index 0000000..cb72c24
--- /dev/null
+++ b/src/gst-plugins-bad-1-fixes.patch
@@ -0,0 +1,41 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Boris Nagaev <bnagaev@gmail.com>
+Date: Fri, 30 Dec 2016 19:59:12 +0100
+Subject: [PATCH] fix neon headers location
+
+See https://github.com/mxe/mxe/issues/1619
+
+diff --git a/ext/neon/gstneonhttpsrc.c b/ext/neon/gstneonhttpsrc.c
+index 1111111..2222222 100644
+--- a/ext/neon/gstneonhttpsrc.c
++++ b/ext/neon/gstneonhttpsrc.c
+@@ -25,7 +25,7 @@
+ #include <unistd.h>
+ #endif /* _HAVE_UNISTD_H */
+
+-#include <ne_redirect.h>
++#include <neon/ne_redirect.h>
+
+ #define STATUS_IS_REDIRECTION(status) ((status) >= 300 && (status) < 400)
+
+diff --git a/ext/neon/gstneonhttpsrc.h b/ext/neon/gstneonhttpsrc.h
+index 1111111..2222222 100644
+--- a/ext/neon/gstneonhttpsrc.h
++++ b/ext/neon/gstneonhttpsrc.h
+@@ -23,9 +23,9 @@
+
+ G_BEGIN_DECLS
+
+-#include <ne_session.h>
+-#include <ne_request.h>
+-#include <ne_socket.h>
++#include <neon/ne_session.h>
++#include <neon/ne_request.h>
++#include <neon/ne_socket.h>
+
+ #define GST_TYPE_NEONHTTP_SRC \
+ (gst_neonhttp_src_get_type())
diff --git a/src/gst-plugins-bad.mk b/src/gst-plugins-bad.mk
index 9c0c2a0..476bff8 100644
--- a/src/gst-plugins-bad.mk
+++ b/src/gst-plugins-bad.mk
@@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef39
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS := gcc faad2 gst-plugins-base gstreamer libass libgcrypt mpg123 openal openjpeg vo-aacenc vo-amrwbenc
+$(PKG)_DEPS := gcc faad2 gst-plugins-base gstreamer libass libgcrypt mpg123 neon openal openjpeg vo-aacenc vo-amrwbenc
$(PKG)_UPDATE = $(subst gstreamer/refs,gst-plugins-bad/refs,$(gstreamer_UPDATE))
--
1.7.10.4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment