Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

gst-plugins-bad: Update to 1.4.0

Browse Source
This commit is contained in:
Alexpux
2014-07-21 14:06:12 +04:00
parent bb93fd52c2
commit 05288cc428
7 changed files with 8 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mingw-w64-gst-plugins-bad/0001-give-cc-to-gir-scanner.mingw.patch
View File

@@ -54,24 +54,3 @@ diff -Naur gst-plugins-bad-1.3.3-orig/gst-libs/gst/mpegts/Makefile.am gst-plugin
--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
diff -Naur gst-plugins-bad-1.3.3-orig/gst-libs/gst/wayland/Makefile.am gst-plugins-bad-1.3.3/gst-libs/gst/wayland/Makefile.am
--- gst-plugins-bad-1.3.3-orig/gst-libs/gst/wayland/Makefile.am 2014-06-19 20:34:04.000000000 +0400
+++ gst-plugins-bad-1.3.3/gst-libs/gst/wayland/Makefile.am 2014-07-11 01:08:41.676400000 +0400
@@ -35,13 +35,16 @@
GstWayland-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstwayland-@GST_API_VERSION@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
+ CC="$(CC)" \
$(INTROSPECTION_SCANNER) -v --namespace GstWayland \
--nsversion=@GST_API_VERSION@ \
- --strip-prefix=Gst \
+ --identifier-prefix=Gst \
+ --symbol-prefix=gst \
--warn-all \
--c-include "gst/wayland/wayland.h" \
-I$(top_srcdir)/gst-libs \
-I$(top_builddir)/gst-libs \
+ `$(PKG_CONFIG) --cflags-only-I gstreamer-@GST_API_VERSION@` \
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
--library=libgstwayland-@GST_API_VERSION@.la \
--include=Gst-@GST_API_VERSION@ \

11
mingw-w64-gst-plugins-bad/0002-fix-ldflags.patch
View File

@@ -1,11 +0,0 @@
--- gst-plugins-bad-1.3.3/gst-libs/gst/base/Makefile.am.orig 2014-06-22 16:21:35.000000000 +0400
+++ gst-plugins-bad-1.3.3/gst-libs/gst/base/Makefile.am 2014-07-11 11:34:43.291200000 +0400
@@ -7,7 +7,7 @@
-DGST_USE_UNSTABLE_API
libgstbadbase_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS)
-libgstbadbase_@GST_API_VERSION@_la_LDFLAGS = $(GST_LDFLAGS)
+libgstbadbase_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
libgstbadbase_@GST_API_VERSION@includedir = \
$(includedir)/gstreamer-@GST_API_VERSION@/gst/base

6
mingw-w64-gst-plugins-bad/0005-fix-cast-errors.patch
View File

@@ -5,7 +5,7 @@
&cur_clock_handle_size, NULL)) {
GST_DEBUG ("current master clock handle: 0x%08x",
- (guint) * cur_clock_handle);
+ GPOINTER_TO_INT(* cur_clock_handle));
+ (guint) (guintptr) * cur_clock_handle);
CloseHandle (*cur_clock_handle);
g_free (cur_clock_handle);
} else {
@@ -17,8 +17,8 @@
(guint) subtype_guid.Data3,
- (guint) subtype_guid.Data4, (guint) & subtype_guid.Data4[2],
- (guint) & subtype_guid.Data4[6]);
+ GPOINTER_TO_INT(subtype_guid.Data4), GPOINTER_TO_INT(& subtype_guid.Data4[2]),
+ GPOINTER_TO_INT(& subtype_guid.Data4[6]));
+ (guint) (guintptr) subtype_guid.Data4, (guint) (guintptr) & subtype_guid.Data4[2],
+ (guint) (guintptr) & subtype_guid.Data4[6]);
}
return structure;

44
mingw-w64-gst-plugins-bad/0006-win32-winsock.patch
View File

@@ -1,44 +0,0 @@
--- gst-plugins-bad-1.3.3/ext/curl/gstcurlsshsink.c 2014-07-11 13:08:04.322000000 +0400
+++ gst-plugins-bad-1.3.3/ext/curl/gstcurlsshsink.c.new 2014-07-11 12:24:17.629200000 +0400
@@ -34,12 +34,17 @@
#include <string.h>
#include <stdio.h>
+#include <gst/gst.h>
+#ifdef G_OS_WIN32
+#include <winsock2.h>
+#else
#include <sys/socket.h>
-#include <sys/types.h>
#include <netinet/in.h>
-#include <unistd.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
+#endif
+#include <sys/types.h>
+#include <unistd.h>
#include <sys/stat.h>
#include <fcntl.h>
--- gst-plugins-bad-1.3.3/ext/curl/gstcurlsftpsink.c 2014-07-11 13:07:59.532800000 +0400
+++ gst-plugins-bad-1.3.3/ext/curl/gstcurlsftpsink.c.new 2014-07-11 12:25:08.251200000 +0400
@@ -48,12 +48,17 @@
#include <string.h>
#include <stdio.h>
+#include <gst/gst.h>
+#ifdef G_OS_WIN32
+#include <winsock2.h>
+#else
#include <sys/socket.h>
-#include <sys/types.h>
#include <netinet/in.h>
-#include <unistd.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
+#endif
+#include <sys/types.h>
+#include <unistd.h>
#include <sys/stat.h>
#include <fcntl.h>

116
mingw-w64-gst-plugins-bad/0007-motioncels-use-no-net.patch
View File

@@ -1,116 +0,0 @@
From 0ea13d7a65e5fcbe1ce452f0b3843895652061e1 Mon Sep 17 00:00:00 2001
From: Sebastian Dröge <sebastian@centricular.com>
Date: Fri, 11 Jul 2014 11:25:18 +0000
Subject: motioncells: Use no network API if not required
---
diff --git a/ext/opencv/MotionCells.cpp b/ext/opencv/MotionCells.cpp
index 1d88e10..5eaa67f 100644
--- a/ext/opencv/MotionCells.cpp
+++ b/ext/opencv/MotionCells.cpp
@@ -53,37 +53,8 @@
#include <errno.h>
#include <math.h>
#include <gst/gst.h>
-#include <arpa/inet.h>
#include "MotionCells.h"
-uint64_t ntohl64 (uint64_t val);
-uint64_t htonl64 (uint64_t val);
-
-uint64_t
-ntohl64 (uint64_t val)
-{
- uint64_t res64;
- uint32_t low = (uint32_t) (val & 0x00000000FFFFFFFFLL);
- uint32_t high = (uint32_t) ((val & 0xFFFFFFFF00000000LL) >> 32);
- low = ntohl (low);
- high = ntohl (high);
- res64 = (uint64_t) high + (((uint64_t) low) << 32);
- return res64;
-}
-
-
-uint64_t
-htonl64 (uint64_t val)
-{
- uint64_t res64;
- uint32_t low = (uint32_t) (val & 0x00000000FFFFFFFFLL);
- uint32_t high = (uint32_t) ((val & 0xFFFFFFFF00000000LL) >> 32);
- low = htonl (low);
- high = htonl (high);
- res64 = (uint64_t) high + (((uint64_t) low) << 32);
- return res64;
-}
-
MotionCells::MotionCells ()
{
m_framecnt = 0;
@@ -364,20 +330,20 @@ MotionCells::initDataFile (char *p_datafile, gint64 starttime) //p_date is incr
}
} else
mc_savefile = NULL;
- bzero (&m_header, sizeof (MotionCellHeader));
- m_header.headersize = htonl (MC_HEADER);
- m_header.type = htonl (MC_TYPE);
- m_header.version = htonl (MC_VERSION);
+ memset (&m_header, 0, sizeof (MotionCellHeader));
+ m_header.headersize = GINT32_TO_BE (MC_HEADER);
+ m_header.type = GINT32_TO_BE (MC_TYPE);
+ m_header.version = GINT32_TO_BE (MC_VERSION);
//it needs these bytes
m_header.itemsize =
- htonl ((int) ceil (ceil (m_gridx * m_gridy / 8.0) / 4.0) * 4 +
+ GINT32_TO_BE ((int) ceil (ceil (m_gridx * m_gridy / 8.0) / 4.0) * 4 +
sizeof (mcd.timestamp));
- m_header.gridx = htonl (m_gridx);
- m_header.gridy = htonl (m_gridy);
- m_header.starttime = htonl64 (starttime);
+ m_header.gridx = GINT32_TO_BE (m_gridx);
+ m_header.gridy = GINT32_TO_BE (m_gridy);
+ m_header.starttime = GINT64_TO_BE (starttime);
snprintf (m_header.name, sizeof (m_header.name), "%s %dx%d", MC_VERSIONTEXT,
- ntohl (m_header.gridx), ntohl (m_header.gridy));
+ GINT32_FROM_BE (m_header.gridx), GINT32_FROM_BE (m_header.gridy));
m_changed_datafile = false;
return 0;
}
@@ -387,7 +353,7 @@ MotionCells::saveMotionCells (gint64 timestamp_millisec)
{
MotionCellData mc_data;
- mc_data.timestamp = htonl (timestamp_millisec);
+ mc_data.timestamp = GINT32_TO_BE (timestamp_millisec);
mc_data.data = NULL;
//There is no datafile
if (mc_savefile == NULL)
@@ -407,7 +373,7 @@ MotionCells::saveMotionCells (gint64 timestamp_millisec)
mc_data.data =
(char *) calloc (1,
- ntohl (m_header.itemsize) - sizeof (mc_data.timestamp));
+ GINT32_FROM_BE (m_header.itemsize) - sizeof (mc_data.timestamp));
if (mc_data.data == NULL) {
//fprintf(stderr, "%s %d:saveMotionCells:calloc:%d (%s)\n", __FILE__, __LINE__, errno,
//strerror(errno));
@@ -418,7 +384,7 @@ MotionCells::saveMotionCells (gint64 timestamp_millisec)
for (unsigned int i = 0; i < m_MotionCells.size (); i++) {
int bitnum =
- m_MotionCells.at (i).lineidx * ntohl (m_header.gridx) +
+ m_MotionCells.at (i).lineidx * GINT32_FROM_BE (m_header.gridx) +
m_MotionCells.at (i).colidx;
int bytenum = (int) floor (bitnum / 8.0);
int shift = bitnum - bytenum * 8;
@@ -437,7 +403,7 @@ MotionCells::saveMotionCells (gint64 timestamp_millisec)
}
if (fwrite (mc_data.data,
- ntohl (m_header.itemsize) - sizeof (mc_data.timestamp), 1,
+ GINT32_FROM_BE (m_header.itemsize) - sizeof (mc_data.timestamp), 1,
mc_savefile) != 1) {
//fprintf(stderr, "%s %d:saveMotionCells:fwrite:%d (%s)\n", __FILE__, __LINE__, errno,
//strerror(errno));
--
cgit v0.9.0.2-2-gbebe

21
mingw-w64-gst-plugins-bad/0008-examples-gtk3.patch
View File

@@ -1,21 +0,0 @@
--- gst-plugins-bad-1.3.3/tests/examples/gl/gtk/fxtest/pixbufdrop.c.orig 2014-03-21 18:07:47.000000000 +0400
+++ gst-plugins-bad-1.3.3/tests/examples/gl/gtk/fxtest/pixbufdrop.c 2014-07-11 12:12:35.533200000 +0400
@@ -141,10 +141,6 @@
GtkSelectionData * seldata, guint inf, guint time, gpointer data)
{
SourceData *userdata = g_new0 (SourceData, 1);
-#ifdef G_OS_WIN32
- gchar *filename =
- g_filename_from_uri ((const gchar *) seldata->data, NULL, NULL);
-#else
GdkPixbufFormat *format;
gchar **uris = gtk_selection_data_get_uris (seldata);
gchar *filename = NULL;
@@ -156,7 +156,6 @@
g_return_if_fail (format);
g_print ("received %s image: %s\n", filename,
gdk_pixbuf_format_get_name (format));
-#endif
userdata->nick = (gchar *) "location";
userdata->value = g_strdup (filename);

22
mingw-w64-gst-plugins-bad/PKGBUILD
View File

@@ -2,7 +2,7 @@
_realname=gst-plugins-bad
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.3.3
pkgver=1.4.0
pkgrel=1
pkgdesc="GStreamer Multimedia Framework Bad Plugins (mingw-w64)"
arch=('any')
@@ -43,30 +43,18 @@ depends=("${MINGW_PACKAGE_PREFIX}-curl"
options=(!libtool strip staticlibs)
source=(${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz
0001-give-cc-to-gir-scanner.mingw.patch
0002-fix-ldflags.patch
0004-fix-X-detection.mingw.patch
0005-fix-cast-errors.patch
0006-win32-winsock.patch
0007-motioncels-use-no-net.patch
0008-examples-gtk3.patch)
md5sums=('e45cd6f389ab9f5be88e731ba94c4fd5'
'9b40bf4167ca872b69429f04a67b2d02'
'8ae9c566838d6a5b5dbf42e5760e2793'
0005-fix-cast-errors.patch)
md5sums=('3bc0fcfe8d16ad1295f0454c1fcb4ba3'
'f95294f2282016457d38882aff845e39'
'eb0a27e74755e4ee1c5259c8c4ab40e8'
'8ed893b5ae43eb215e51d8c8f3e55edd'
'85fc9c14873fea868263c9ee077957d6'
'8c6242d24ada30e88bb102afc4dc2901'
'fcd5ce41047d2c318bbcd3dfb17d5a22')
'4b5d2fd35cd443a1eabd609401386457')
prepare() {
cd ${srcdir}/${_realname}-${pkgver}
patch -p1 -i ${srcdir}/0001-give-cc-to-gir-scanner.mingw.patch
patch -p1 -i ${srcdir}/0002-fix-ldflags.patch
patch -p0 -i ${srcdir}/0004-fix-X-detection.mingw.patch
patch -p1 -i ${srcdir}/0005-fix-cast-errors.patch
patch -p1 -i ${srcdir}/0006-win32-winsock.patch
patch -p1 -i ${srcdir}/0007-motioncels-use-no-net.patch
patch -p1 -i ${srcdir}/0008-examples-gtk3.patch
NOCONFIGURE=1 ./autogen.sh
}