Skip to content

Commit

Permalink
Merge pull request #4631 from OpenELEC/package-updates
Browse files Browse the repository at this point in the history
thanks :)
  • Loading branch information
Christian Hewitt committed Jan 18, 2016
2 parents aee4a3b + c8207db commit a040916
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 31 deletions.
2 changes: 1 addition & 1 deletion packages/graphics/mesa/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
################################################################################

PKG_NAME="mesa"
PKG_VERSION="11.1.0"
PKG_VERSION="11.1.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
diff -Naur RTL8812AU-3f015f0/os_dep/linux/usb_intf.c RTL8812AU-3f015f0.patch/os_dep/linux/usb_intf.c
--- RTL8812AU-3f015f0/os_dep/linux/usb_intf.c 2015-07-14 21:45:26.000000000 +0200
+++ RTL8812AU-3f015f0.patch/os_dep/linux/usb_intf.c 2016-01-17 12:01:14.594776191 +0100
@@ -278,7 +278,7 @@
{USB_DEVICE(0x13B1, 0x003F),.driver_info = RTL8812}, /* Linksys - SerComm */
{USB_DEVICE(0x2357, 0x0101),.driver_info = RTL8812}, /* TP-Link - T4U */
{USB_DEVICE(0x148F, 0x9097),.driver_info = RTL8812}, /* Amped Wireless ACA1 */
- {USB_DEVICE(0x2357, 0x0103),.driver_info = RTL8812}, /* TP-Link - T4UH */
+ {USB_DEVICE(0x2357, 0x0103),.driver_info = RTL8812}, /* TP-Link - T4UH */
#endif

#ifdef CONFIG_RTL8821A
@@ -288,15 +288,19 @@
{USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8822),.driver_info = RTL8821},/* Default ID */
{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDER_ID_REALTEK, 0x0820,0xff,0xff,0xff),.driver_info = RTL8821}, /* 8821AU */
/*=== Customer ID ===*/
+ {USB_DEVICE(0x056e, 0x4007),.driver_info = RTL8821}, /* Elecom - WDC-433DU2HBK */
{USB_DEVICE(0x7392, 0xA811),.driver_info = RTL8821}, /* Edimax - Edimax */
- {USB_DEVICE(0x0BDA, 0xA811),.driver_info = RTL8821}, /* OUTLINK - Edimax */
+ {USB_DEVICE(0x0BDA, 0xA811),.driver_info = RTL8821}, /* OUTLINK - Edimax */
{USB_DEVICE(0x7392, 0xA812),.driver_info = RTL8821}, /* Edimax - Edimax */
+ {USB_DEVICE(0x7392, 0xA813),.driver_info = RTL8821}, /* Edimax - EW-7811UAC */
{USB_DEVICE(0x2001, 0x3314),.driver_info = RTL8821}, /* D-Link - Cameo */
{USB_DEVICE(0x0846, 0x9052),.driver_info = RTL8821}, /* Netgear - A6100 */
- {USB_DEVICE(0x04BB, 0x0953),.driver_info = RTL8821}, /* I-O DATA - Edimax */
- {USB_DEVICE(0x2001, 0x3318),.driver_info = RTL8821}, /* D-Link - Cameo */
- {USB_DEVICE(0x0E66, 0x0023),.driver_info = RTL8821}, /* HAWKING - Edimax */
+ {USB_DEVICE(0x2019, 0xAB32),.driver_info = RTL8821}, /* Planex - GW-450S */
+ {USB_DEVICE(0x04BB, 0x0953),.driver_info = RTL8821}, /* I-O DATA - Edimax */
+ {USB_DEVICE(0x2001, 0x3318),.driver_info = RTL8821}, /* D-Link - Cameo */
+ {USB_DEVICE(0x0E66, 0x0023),.driver_info = RTL8821}, /* HAWKING - Edimax */
{USB_DEVICE(0x0411, 0x0242),.driver_info = RTL8821}, /* BUFFALO - Edimax */
+ {USB_DEVICE(0x0411, 0x025D),.driver_info = RTL8821}, /* BUFFALO WI-U3-866D */
{USB_DEVICE(0x2001, 0x3318),.driver_info = RTL8821}, /* D-Link DWA-172 */
#endif

2 changes: 1 addition & 1 deletion packages/mediacenter/OpenELEC-settings/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
################################################################################

PKG_NAME="OpenELEC-settings"
PKG_VERSION="0.6.8"
PKG_VERSION="0.6.9"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="prop."
Expand Down
2 changes: 1 addition & 1 deletion packages/multimedia/ffmpeg/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
################################################################################

PKG_NAME="ffmpeg"
PKG_VERSION="2.8.4"
PKG_VERSION="2.8.5"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPLv2.1+"
Expand Down
27 changes: 0 additions & 27 deletions packages/multimedia/ffmpeg/patches/ffmpeg-2.8-kodi.patch
Original file line number Diff line number Diff line change
Expand Up @@ -583,30 +583,3 @@ index f9754eb..cc23f80 100755
fi

# no revision number found

From 249bf32ec3db11916b7705164cb14aefbf627761 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Tue, 22 Dec 2015 16:19:44 +0100
Subject: [PATCH 13/13] avformat/mov: Update handbrake_version threshold for
full mp3 parsing

Fixes: Endangered\ Species\ 1x01\ Collecting\ Merl.mp4

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavformat/mov.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2c364ac..8534bf9 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4535,7 +4535,7 @@ static int mov_read_header(AVFormatContext *s)
}
}
if (mov->handbrake_version &&
- mov->handbrake_version <= 1000000*0 + 1000*10 + 0 && // 0.10.0
+ mov->handbrake_version <= 1000000*0 + 1000*10 + 2 && // 0.10.2
st->codec->codec_id == AV_CODEC_ID_MP3
) {
av_log(s, AV_LOG_VERBOSE, "Forcing full parsing for mp3 stream\n");
2 changes: 1 addition & 1 deletion packages/x11/lib/pixman/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
################################################################################

PKG_NAME="pixman"
PKG_VERSION="0.33.4"
PKG_VERSION="0.33.6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
Expand Down

0 comments on commit a040916

Please sign in to comment.