mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -1,16 +0,0 @@
|
||||
Fix misdetection while nios2 cross-compile
|
||||
|
||||
Signed-off-bye: Waldemar Brodkorb <wbx@openadk.org>
|
||||
|
||||
diff -Nur libdvdnav-5.0.3.orig/configure.ac libdvdnav-5.0.3/configure.ac
|
||||
--- libdvdnav-5.0.3.orig/configure.ac 2015-01-27 16:57:43.000000000 +0100
|
||||
+++ libdvdnav-5.0.3/configure.ac 2016-07-31 11:48:09.312947473 +0200
|
||||
@@ -73,7 +73,7 @@
|
||||
[*mingw32* | *cygwin*], [AC_CHECK_FUNCS(gettimeofday)])
|
||||
|
||||
AS_CASE([$host],
|
||||
- [*os2*], [LDFLAGS="$LDFLAGS -no-undefined"])
|
||||
+ [*-os2*], [LDFLAGS="$LDFLAGS -no-undefined"])
|
||||
|
||||
dnl ---------------------------------------------
|
||||
dnl threads
|
||||
@@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBDVDNAV
|
||||
DVD navigation features such as DVD menus, multiangle
|
||||
playback and even interactive DVD games.
|
||||
|
||||
http://www.mplayerhq.hu
|
||||
https://www.videolan.org/developers/libdvdnav.html
|
||||
|
||||
comment "libdvdnav needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
# From http://download.videolan.org/pub/videolan/libdvdnav/6.0.0/libdvdnav-6.0.0.tar.bz2.sha256
|
||||
sha256 f0a2711b08a021759792f8eb14bb82ff8a3c929bf88c33b64ffcddaa27935618 libdvdnav-6.0.0.tar.bz2
|
||||
# From http://download.videolan.org/pub/videolan/libdvdnav/6.1.0/libdvdnav-6.1.0.tar.bz2.md5
|
||||
md5 8817ac12c13644df6ba2091c2dcaeed3 libdvdnav-6.1.0.tar.bz2
|
||||
# From http://download.videolan.org/pub/videolan/libdvdnav/6.1.0/libdvdnav-6.1.0.tar.bz2.sha1
|
||||
sha1 b0597e9d11393e17b57f784c0dcba33a499e80b0 libdvdnav-6.1.0.tar.bz2
|
||||
# From http://download.videolan.org/pub/videolan/libdvdnav/6.1.0/libdvdnav-6.1.0.tar.bz2.sha256
|
||||
sha256 f697b15ea9f75e9f36bdf6ec3726308169f154e2b1e99865d0bbe823720cee5b libdvdnav-6.1.0.tar.bz2
|
||||
|
||||
# Hash for license file:
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
|
||||
@@ -4,14 +4,13 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBDVDNAV_VERSION = 6.0.0
|
||||
LIBDVDNAV_VERSION = 6.1.0
|
||||
LIBDVDNAV_SOURCE = libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
|
||||
LIBDVDNAV_SITE = http://www.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION)
|
||||
LIBDVDNAV_INSTALL_STAGING = YES
|
||||
LIBDVDNAV_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
|
||||
LIBDVDNAV_DEPENDENCIES = libdvdread host-pkgconf
|
||||
LIBDVDNAV_LICENSE = GPL-2.0+
|
||||
LIBDVDNAV_LICENSE_FILES = COPYING
|
||||
# 0001-do-not-match-nios2-as-os2.patch
|
||||
LIBDVDNAV_AUTORECONF = YES
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user