mirror of https://git.wownero.com/dsc/mxe.git
update packages file xine-lib
This commit is contained in:
parent
7cfca695cf
commit
aca1f5d8fe
|
@ -4,8 +4,8 @@
|
|||
# file
|
||||
PKG := file
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 5.09
|
||||
$(PKG)_CHECKSUM := 9d905f9e50033c3f5be3728473cbb709a41550fb
|
||||
$(PKG)_VERSION := 5.10
|
||||
$(PKG)_CHECKSUM := 72fd435e78955ee122b7b3d323ff2f92e6263e89
|
||||
$(PKG)_SUBDIR := file-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := file-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_WEBSITE := http://www.darwinsys.com/file/
|
||||
|
|
|
@ -3,7 +3,7 @@ See doc/index.html for further information.
|
|||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 10c6f4cb18b2b8e710a89ac36e360f3bb414a81c Mon Sep 17 00:00:00 2001
|
||||
From 4968ed3c3300976ce8b24c52c729db6bd264057c Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Sun, 13 Nov 2011 11:48:07 +0100
|
||||
Subject: [PATCH 1/3] fix-install-def-file
|
||||
|
@ -44,10 +44,10 @@ index 167a32b..0664e1f 100644
|
|||
$(XINEUTILS_LIB):
|
||||
$(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la
|
||||
--
|
||||
1.7.7
|
||||
1.7.8
|
||||
|
||||
|
||||
From 536bda7f4b05f9a70bfbeca9578565a03b54c94e Mon Sep 17 00:00:00 2001
|
||||
From 86f2d23f9229e17aa4a54ca982b8f95de5ee4644 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Sun, 13 Nov 2011 12:05:22 +0100
|
||||
Subject: [PATCH 2/3] fake missing definitions for WIN32
|
||||
|
@ -56,12 +56,12 @@ Taken from:
|
|||
https://bugs.xine-project.org/show_bug.cgi?id=433
|
||||
|
||||
diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c
|
||||
index 0895a2e..51f8855 100644
|
||||
index 802461e..8b9b704 100644
|
||||
--- a/src/audio_out/audio_file_out.c
|
||||
+++ b/src/audio_out/audio_file_out.c
|
||||
@@ -40,6 +40,18 @@
|
||||
|
||||
#define GAP_TOLERANCE INT_MAX
|
||||
@@ -53,6 +53,18 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#ifdef WIN32
|
||||
+#ifndef S_IWUSR
|
||||
|
@ -78,29 +78,21 @@ index 0895a2e..51f8855 100644
|
|||
/* Taken (hStudlyCapsAndAll) from sox's wavwritehdr */
|
||||
|
||||
struct wavhdr {
|
||||
@@ -116,7 +128,6 @@ static int ao_file_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int
|
||||
this->fname = "xine-out.wav";
|
||||
|
||||
this->fd = xine_create_cloexec(this->fname, O_WRONLY|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
|
||||
-
|
||||
if (this->fd == -1) {
|
||||
xprintf (this->xine, XINE_VERBOSITY_LOG, "audio_file_out: Failed to open file '%s': %s\n",
|
||||
this->fname, strerror(errno));
|
||||
--
|
||||
1.7.7
|
||||
1.7.8
|
||||
|
||||
|
||||
From 68609a4508116803346b4fd962f3ed3141c70316 Mon Sep 17 00:00:00 2001
|
||||
From 42946ec1f900d22b62cb28996b9f12d11d7be7a8 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Sun, 13 Nov 2011 13:45:21 +0100
|
||||
Subject: [PATCH 3/3] force graphicsmagick over imagemagick
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 6af7ef7..2682e39 100644
|
||||
index b175301..d37ba36 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1419,21 +1419,12 @@ AC_ARG_WITH([imagemagick],
|
||||
@@ -1412,14 +1412,6 @@ AC_ARG_WITH([imagemagick],
|
||||
AS_HELP_STRING([--without-imagemagick], [Build without ImageMagick image decoder (or GraphicsMagick's compat layer)]))
|
||||
|
||||
if test "x$with_imagemagick" != "xno"; then
|
||||
|
@ -112,22 +104,17 @@ index 6af7ef7..2682e39 100644
|
|||
- WAND_LIBS="$MAGICKWAND_LIBS"
|
||||
- fi
|
||||
- if test "x$have_imagemagick" = 'xno'; then
|
||||
- PKG_CHECK_MODULES([GRAPHICSMAGICK], [ImageMagick], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
|
||||
- PKG_CHECK_MODULES([GRAPHICSMAGICKWAND], [GraphicsMagickWand], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
|
||||
- dnl The following assignments are safe, since they include
|
||||
- dnl the flags for plain GraphicsMagick
|
||||
- WAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS"
|
||||
- WAND_LIBS="$GRAPHICSMAGICKWAND_LIBS"
|
||||
PKG_CHECK_MODULES([GRAPHICSMAGICK], [ImageMagick], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
|
||||
PKG_CHECK_MODULES([GRAPHICSMAGICKWAND], [GraphicsMagickWand], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
|
||||
dnl The following assignments are safe, since they include
|
||||
@@ -1427,7 +1419,6 @@ if test "x$with_imagemagick" != "xno"; then
|
||||
WAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS"
|
||||
WAND_LIBS="$GRAPHICSMAGICKWAND_LIBS"
|
||||
AC_DEFINE([HAVE_GRAPHICSMAGICK], [1], [Define this if you have GraphicsMagick installed])
|
||||
- fi
|
||||
+ PKG_CHECK_MODULES([GRAPHICSMAGICK], [ImageMagick], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
|
||||
+ PKG_CHECK_MODULES([GRAPHICSMAGICKWAND], [GraphicsMagickWand], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
|
||||
+ dnl The following assignments are safe, since they include
|
||||
+ dnl the flags for plain GraphicsMagick
|
||||
+ WAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS"
|
||||
+ WAND_LIBS="$GRAPHICSMAGICKWAND_LIBS"
|
||||
if test "x$with_imagemagick" = "xyes" && test "x$have_imagemagick" = "xno"; then
|
||||
AC_MSG_ERROR([ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found])
|
||||
elif test "x$have_imagemagick" = "xyes"; then
|
||||
--
|
||||
1.7.7
|
||||
1.7.8
|
||||
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
# xine-lib
|
||||
PKG := xine-lib
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 1.1.20
|
||||
$(PKG)_CHECKSUM := 60ce1cea9bf7a6b7d8c60141593a8ed0c54f9445
|
||||
$(PKG)_VERSION := 1.1.20.1
|
||||
$(PKG)_CHECKSUM := 68e85049723b491ccb22d5123bf8fa780529868a
|
||||
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
|
||||
$(PKG)_WEBSITE := http://www.xine-project.org/
|
||||
|
|
Loading…
Reference in New Issue