mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
Merge branch 'master' into openelec-pvr
Conflicts: packages/mediacenter/xbmc-theme-Confluence/meta packages/mediacenter/xbmc/meta packages/mediacenter/xbmc/patches/xbmc-0e174c0-001-add_support_to_specify_GIT_REV-0.1.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-013-reenable_lcd_config_settings-0.1.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-303-fix_libdvd_xFLAGS-0.1.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-311-fix_rsxs_build-0.1.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-351-increase_YV12_buffers-0.1.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-402-enable_yasm_in_ffmpeg-0.1.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-404-add_lame_check-0.6.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-452-change_lcd_content-0.1.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-453-add_openelec.tv_RSS_news-0.1.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-454-disable_backslash-0.1.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-457-fix_connection_check-0.1.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-462-add_remote_irtrans_mediacenter-0.1.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-463-add_remote_devinput-0.1.patch packages/mediacenter/xbmc/patches/xbmc-0e174c0-464-add_eject_keymapping_for_lirc-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-001-add_support_to_specify_GIT_REV-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-013-reenable_lcd_config_settings-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-303-fix_libdvd_xFLAGS-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-311-fix_rsxs_build-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-351-increase_YV12_buffers-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-402-enable_yasm_in_ffmpeg-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-404-add_lame_check-0.6.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-452-change_lcd_content-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-453-add_openelec.tv_RSS_news-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-454-disable_backslash-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-457-fix_connection_check-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-462-add_remote_irtrans_mediacenter-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-463-add_remote_devinput-0.1.patch packages/mediacenter/xbmc/patches/xbmc-2e00d86-464-add_eject_keymapping_for_lirc-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-001-add_support_to_specify_GIT_REV-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-013-reenable_lcd_config_settings-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-303-fix_libdvd_xFLAGS-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-311-fix_rsxs_build-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-351-increase_YV12_buffers-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-402-enable_yasm_in_ffmpeg-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-404-add_lame_check-0.6.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-452-change_lcd_content-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-453-add_openelec.tv_RSS_news-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-454-disable_backslash-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-457-fix_connection_check-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-462-add_remote_irtrans_mediacenter-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-463-add_remote_devinput-0.1.patch packages/mediacenter/xbmc/patches/xbmc-51c5336-464-add_eject_keymapping_for_lirc-0.1.patch
This commit is contained in:
Gujs
commit
f089fe2a1e
@ -8,6 +8,7 @@ Package updates:
|
|||||||
- update Python to Python-2.7.2
|
- update Python to Python-2.7.2
|
||||||
- update gcc to gcc-4.6.2
|
- update gcc to gcc-4.6.2
|
||||||
- update openssl to openssl-1.0.0e
|
- update openssl to openssl-1.0.0e
|
||||||
|
- update xorg-server to xorg-server-1.11
|
||||||
|
|
||||||
Added functions:
|
Added functions:
|
||||||
- PXE netboot support
|
- PXE netboot support
|
||||||
|
|||||||
@ -19,12 +19,12 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="lame"
|
PKG_NAME="lame"
|
||||||
PKG_VERSION="3.99"
|
PKG_VERSION="3.99.2"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="LGPL"
|
PKG_LICENSE="LGPL"
|
||||||
PKG_SITE="http://lame.sourceforge.net/"
|
PKG_SITE="http://lame.sourceforge.net/"
|
||||||
PKG_URL="$SOURCEFORGE_SRC/lame/lame/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
|
PKG_URL="$SOURCEFORGE_SRC/lame/lame/3.99/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||||
PKG_DEPENDS=""
|
PKG_DEPENDS=""
|
||||||
PKG_BUILD_DEPENDS="toolchain"
|
PKG_BUILD_DEPENDS="toolchain"
|
||||||
PKG_PRIORITY="optional"
|
PKG_PRIORITY="optional"
|
||||||
|
|||||||
@ -27,30 +27,23 @@ cd $PKG_BUILD
|
|||||||
--build=$HOST_NAME \
|
--build=$HOST_NAME \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--disable-static \
|
|
||||||
--enable-shared \
|
|
||||||
--disable-rpath \
|
|
||||||
--enable-cxx \
|
--enable-cxx \
|
||||||
--disable-cpp-progs \
|
--disable-cpp-progs \
|
||||||
|
--enable-shared \
|
||||||
|
--disable-static \
|
||||||
--enable-joliet \
|
--enable-joliet \
|
||||||
|
--disable-rpath \
|
||||||
--enable-rock \
|
--enable-rock \
|
||||||
--disable-cddb \
|
--disable-cddb \
|
||||||
--disable-vcd-info \
|
--disable-vcd-info \
|
||||||
--with-cd-drive \
|
--without-cd-drive \
|
||||||
--with-cd-info \
|
--without-cd-info \
|
||||||
--with-cd-paranoia \
|
--with-cd-paranoia \
|
||||||
--with-cdda_player \
|
--without-cdda-player \
|
||||||
--with-cd-read \
|
--without-cd-read \
|
||||||
--with-iso-info \
|
--without-iso-info \
|
||||||
--with-iso-read \
|
--without-iso-read \
|
||||||
--without-versioned-libs \
|
--with-gnu-ld
|
||||||
--with-libiconv-prefix="$SYSROOT_PREFIX/usr" \
|
|
||||||
|
|
||||||
make -C lib
|
make
|
||||||
make -C include
|
$MAKEINSTALL
|
||||||
|
|
||||||
$MAKEINSTALL -C lib
|
|
||||||
$MAKEINSTALL -C include
|
|
||||||
|
|
||||||
mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
|
|
||||||
cp *.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
|
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="libcdio"
|
PKG_NAME="libcdio"
|
||||||
PKG_VERSION="0.82"
|
PKG_VERSION="0.83"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="linux"
|
PKG_NAME="linux"
|
||||||
PKG_VERSION="3.1"
|
PKG_VERSION="3.1.4"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
358
packages/linux/patches/linux-3.1.4-081-drm_cea_modes.patch
Normal file
358
packages/linux/patches/linux-3.1.4-081-drm_cea_modes.patch
Normal file
@ -0,0 +1,358 @@
|
|||||||
|
diff -Naur linux-3.1.2/drivers/gpu/drm/drm_edid.c linux-3.1.2.patch/drivers/gpu/drm/drm_edid.c
|
||||||
|
--- linux-3.1.2/drivers/gpu/drm/drm_edid.c 2011-11-21 23:47:46.000000000 +0100
|
||||||
|
+++ linux-3.1.2.patch/drivers/gpu/drm/drm_edid.c 2011-11-23 00:35:54.444938016 +0100
|
||||||
|
@@ -1318,6 +1318,7 @@
|
||||||
|
|
||||||
|
#define HDMI_IDENTIFIER 0x000C03
|
||||||
|
#define AUDIO_BLOCK 0x01
|
||||||
|
+#define VIDEO_BLOCK 0x02
|
||||||
|
#define VENDOR_BLOCK 0x03
|
||||||
|
#define EDID_BASIC_AUDIO (1 << 6)
|
||||||
|
|
||||||
|
@@ -1347,6 +1348,47 @@
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(drm_find_cea_extension);
|
||||||
|
|
||||||
|
+static int
|
||||||
|
+do_cea_modes (struct drm_connector *connector, u8 *db, u8 len)
|
||||||
|
+{
|
||||||
|
+ struct drm_device *dev = connector->dev;
|
||||||
|
+ u8 * mode, cea_mode;
|
||||||
|
+ int modes = 0;
|
||||||
|
+
|
||||||
|
+ for (mode = db; mode < db + len; mode++) {
|
||||||
|
+ cea_mode = (*mode & 127) - 1; /* CEA modes are numbered 1..127 */
|
||||||
|
+ if (cea_mode < drm_num_cea_modes) {
|
||||||
|
+ struct drm_display_mode *newmode;
|
||||||
|
+ newmode = drm_mode_duplicate(dev,
|
||||||
|
+ &edid_cea_modes[cea_mode]);
|
||||||
|
+ if (newmode) {
|
||||||
|
+ drm_mode_probed_add(connector, newmode);
|
||||||
|
+ modes++;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return modes;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int
|
||||||
|
+add_cea_modes(struct drm_connector *connector, struct edid *edid)
|
||||||
|
+{
|
||||||
|
+ u8 * cea = drm_find_cea_extension(edid);
|
||||||
|
+ u8 * db, dbl;
|
||||||
|
+ int modes = 0;
|
||||||
|
+
|
||||||
|
+ if (cea && cea[1] >= 3) {
|
||||||
|
+ for (db = cea + 4; db < cea + cea[2]; db += dbl + 1) {
|
||||||
|
+ dbl = db[0] & 0x1f;
|
||||||
|
+ if (((db[0] & 0xe0) >> 5) == VIDEO_BLOCK)
|
||||||
|
+ modes += do_cea_modes (connector, db+1, dbl);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return modes;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* drm_detect_hdmi_monitor - detect whether monitor is hdmi.
|
||||||
|
* @edid: monitor EDID information
|
||||||
|
@@ -1550,6 +1592,7 @@
|
||||||
|
num_modes += add_standard_modes(connector, edid);
|
||||||
|
num_modes += add_established_modes(connector, edid);
|
||||||
|
num_modes += add_inferred_modes(connector, edid);
|
||||||
|
+ num_modes += add_cea_modes(connector, edid);
|
||||||
|
|
||||||
|
if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))
|
||||||
|
edid_fixup_preferred(connector, quirks);
|
||||||
|
diff -Naur linux-3.1.2/drivers/gpu/drm/drm_edid_modes.h linux-3.1.2.patch/drivers/gpu/drm/drm_edid_modes.h
|
||||||
|
--- linux-3.1.2/drivers/gpu/drm/drm_edid_modes.h 2011-11-21 23:47:46.000000000 +0100
|
||||||
|
+++ linux-3.1.2.patch/drivers/gpu/drm/drm_edid_modes.h 2011-11-23 00:31:42.218643364 +0100
|
||||||
|
@@ -378,3 +378,287 @@
|
||||||
|
{ 1920, 1440, 75, 0 },
|
||||||
|
};
|
||||||
|
static const int num_est3_modes = sizeof(est3_modes) / sizeof(est3_modes[0]);
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ * Probably taken from CEA-861 spec.
|
||||||
|
+ * This table is converted from xorg's hw/xfree86/modes/xf86EdidModes.c.
|
||||||
|
+ */
|
||||||
|
+static const struct drm_display_mode edid_cea_modes[] = {
|
||||||
|
+ /* 640x480@60Hz */
|
||||||
|
+ { DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 25175, 640, 656,
|
||||||
|
+ 752, 800, 0, 480, 490, 492, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 720x480@60Hz */
|
||||||
|
+ { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 27000, 720, 736,
|
||||||
|
+ 798, 858, 0, 480, 489, 495, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 720x480@60Hz */
|
||||||
|
+ { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 27000, 720, 736,
|
||||||
|
+ 798, 858, 0, 480, 489, 495, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1280x720@60Hz */
|
||||||
|
+ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1390,
|
||||||
|
+ 1430, 1650, 0, 720, 725, 730, 750, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
|
||||||
|
+ /* 1920x1080i@60Hz */
|
||||||
|
+ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2008,
|
||||||
|
+ 2052, 2200, 0, 1080, 1084, 1094, 1125, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 1440x480i@60Hz */
|
||||||
|
+ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
|
||||||
|
+ 1602, 1716, 0, 480, 488, 494, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 1440x480i@60Hz */
|
||||||
|
+ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
|
||||||
|
+ 1602, 1716, 0, 480, 488, 494, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 1440x240@60Hz */
|
||||||
|
+ { DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
|
||||||
|
+ 1602, 1716, 0, 240, 244, 247, 262, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1440x240@60Hz */
|
||||||
|
+ { DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,
|
||||||
|
+ 1602, 1716, 0, 240, 244, 247, 262, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 2880x480i@60Hz */
|
||||||
|
+ { DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956,
|
||||||
|
+ 3204, 3432, 0, 480, 488, 494, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 2880x480i@60Hz */
|
||||||
|
+ { DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956,
|
||||||
|
+ 3204, 3432, 0, 480, 488, 494, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 2880x240@60Hz */
|
||||||
|
+ { DRM_MODE("2880x240", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956,
|
||||||
|
+ 3204, 3432, 0, 240, 244, 247, 262, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 2880x240@60Hz */
|
||||||
|
+ { DRM_MODE("2880x240", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956,
|
||||||
|
+ 3204, 3432, 0, 240, 244, 247, 262, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1440x480@60Hz */
|
||||||
|
+ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1472,
|
||||||
|
+ 1596, 1716, 0, 480, 489, 495, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1440x480@60Hz */
|
||||||
|
+ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1472,
|
||||||
|
+ 1596, 1716, 0, 480, 489, 495, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1920x1080@60Hz */
|
||||||
|
+ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2008,
|
||||||
|
+ 2052, 2200, 0, 1080, 1084, 1089, 1125, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
|
||||||
|
+ /* 720x576@50Hz */
|
||||||
|
+ { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 27000, 720, 732,
|
||||||
|
+ 796, 864, 0, 576, 581, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 720x576@50Hz */
|
||||||
|
+ { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 27000, 720, 732,
|
||||||
|
+ 796, 864, 0, 576, 581, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1280x720@50Hz */
|
||||||
|
+ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1720,
|
||||||
|
+ 1760, 1980, 0, 720, 725, 730, 750, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
|
||||||
|
+ /* 1920x1080i@50Hz */
|
||||||
|
+ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2448,
|
||||||
|
+ 2492, 2640, 0, 1080, 1084, 1094, 1125, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 1440x576i@50Hz */
|
||||||
|
+ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
|
||||||
|
+ 1590, 1728, 0, 576, 580, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 1440x576i@50Hz */
|
||||||
|
+ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
|
||||||
|
+ 1590, 1728, 0, 576, 580, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 1440x288@50Hz */
|
||||||
|
+ { DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
|
||||||
|
+ 1590, 1728, 0, 288, 290, 293, 312, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1440x288@50Hz */
|
||||||
|
+ { DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,
|
||||||
|
+ 1590, 1728, 0, 288, 290, 293, 312, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 2880x576i@50Hz */
|
||||||
|
+ { DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928,
|
||||||
|
+ 3180, 3456, 0, 576, 580, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 2880x576i@50Hz */
|
||||||
|
+ { DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928,
|
||||||
|
+ 3180, 3456, 0, 576, 580, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 2880x288@50Hz */
|
||||||
|
+ { DRM_MODE("2880x288", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928,
|
||||||
|
+ 3180, 3456, 0, 288, 290, 293, 312, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 2880x288@50Hz */
|
||||||
|
+ { DRM_MODE("2880x288", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928,
|
||||||
|
+ 3180, 3456, 0, 288, 290, 293, 312, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1440x576@50Hz */
|
||||||
|
+ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,
|
||||||
|
+ 1592, 1728, 0, 576, 581, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1440x576@50Hz */
|
||||||
|
+ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,
|
||||||
|
+ 1592, 1728, 0, 576, 581, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1920x1080@50Hz */
|
||||||
|
+ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2448,
|
||||||
|
+ 2492, 2640, 0, 1080, 1084, 1089, 1125, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
|
||||||
|
+ /* 1920x1080@24Hz */
|
||||||
|
+ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2558,
|
||||||
|
+ 2602, 2750, 0, 1080, 1084, 1089, 1125, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
|
||||||
|
+ /* 1920x1080@25Hz */
|
||||||
|
+ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2448,
|
||||||
|
+ 2492, 2640, 0, 1080, 1084, 1089, 1125, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
|
||||||
|
+ /* 1920x1080@30Hz */
|
||||||
|
+ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2008,
|
||||||
|
+ 2052, 2200, 0, 1080, 1084, 1089, 1125, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
|
||||||
|
+ /* 2880x480@60Hz */
|
||||||
|
+ { DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2944,
|
||||||
|
+ 3192, 3432, 0, 480, 489, 495, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 2880x480@60Hz */
|
||||||
|
+ { DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2944,
|
||||||
|
+ 3192, 3432, 0, 480, 489, 495, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 2880x576@50Hz */
|
||||||
|
+ { DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2928,
|
||||||
|
+ 3184, 3456, 0, 576, 581, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 2880x576@50Hz */
|
||||||
|
+ { DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2928,
|
||||||
|
+ 3184, 3456, 0, 576, 581, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1920x1080i@50Hz */
|
||||||
|
+ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 72000, 1920, 1952,
|
||||||
|
+ 2120, 2304, 0, 1080, 1126, 1136, 1250, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 1920x1080i@100Hz */
|
||||||
|
+ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2448,
|
||||||
|
+ 2492, 2640, 0, 1080, 1084, 1094, 1125, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 1280x720@100Hz */
|
||||||
|
+ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 148500, 1280, 1720,
|
||||||
|
+ 1760, 1980, 0, 720, 725, 730, 750, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
|
||||||
|
+ /* 720x576@100Hz */
|
||||||
|
+ { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 54000, 720, 732,
|
||||||
|
+ 796, 864, 0, 576, 581, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 720x576@100Hz */
|
||||||
|
+ { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 54000, 720, 732,
|
||||||
|
+ 796, 864, 0, 576, 581, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1440x576i@100Hz */
|
||||||
|
+ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,
|
||||||
|
+ 1590, 1728, 0, 576, 580, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1440x576i@100Hz */
|
||||||
|
+ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,
|
||||||
|
+ 1590, 1728, 0, 576, 580, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1920x1080i@120Hz */
|
||||||
|
+ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2008,
|
||||||
|
+ 2052, 2200, 0, 1080, 1084, 1094, 1125, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 1280x720@120Hz */
|
||||||
|
+ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 148500, 1280, 1390,
|
||||||
|
+ 1430, 1650, 0, 720, 725, 730, 750, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
|
||||||
|
+ /* 720x480@120Hz */
|
||||||
|
+ { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 54000, 720, 736,
|
||||||
|
+ 798, 858, 0, 480, 489, 495, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 720x480@120Hz */
|
||||||
|
+ { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 54000, 720, 736,
|
||||||
|
+ 798, 858, 0, 480, 489, 495, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1440x480i@120Hz */
|
||||||
|
+ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,
|
||||||
|
+ 1602, 1716, 0, 480, 488, 494, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 1440x480i@120Hz */
|
||||||
|
+ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,
|
||||||
|
+ 1602, 1716, 0, 480, 488, 494, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 720x576@200Hz */
|
||||||
|
+ { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 108000, 720, 732,
|
||||||
|
+ 796, 864, 0, 576, 581, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 720x576@200Hz */
|
||||||
|
+ { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 108000, 720, 732,
|
||||||
|
+ 796, 864, 0, 576, 581, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1440x576i@200Hz */
|
||||||
|
+ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,
|
||||||
|
+ 1590, 1728, 0, 576, 580, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 1440x576i@200Hz */
|
||||||
|
+ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,
|
||||||
|
+ 1590, 1728, 0, 576, 580, 586, 625, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 720x480@240Hz */
|
||||||
|
+ { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 108000, 720, 736,
|
||||||
|
+ 798, 858, 0, 480, 489, 495, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 720x480@240Hz */
|
||||||
|
+ { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 108000, 720, 736,
|
||||||
|
+ 798, 858, 0, 480, 489, 495, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
|
||||||
|
+ /* 1440x480i@240 */
|
||||||
|
+ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,
|
||||||
|
+ 1602, 1716, 0, 480, 488, 494, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 1440x480i@240 */
|
||||||
|
+ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,
|
||||||
|
+ 1602, 1716, 0, 480, 488, 494, 525, 0,
|
||||||
|
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |
|
||||||
|
+ DRM_MODE_FLAG_INTERLACE) },
|
||||||
|
+ /* 1280x720@24Hz */
|
||||||
|
+ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 59400, 1280, 3040,
|
||||||
|
+ 3080, 3300, 0, 720, 725, 730, 750, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
|
||||||
|
+ /* 1280x720@25Hz */
|
||||||
|
+ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 3700,
|
||||||
|
+ 3740, 3960, 0, 720, 725, 730, 750, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
|
||||||
|
+ /* 1280x720@30Hz */
|
||||||
|
+ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 3040,
|
||||||
|
+ 3080, 3300, 0, 720, 725, 730, 750, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
|
||||||
|
+ /* 1920x1080@120Hz */
|
||||||
|
+ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2008,
|
||||||
|
+ 2052, 2200, 0, 1080, 1084, 1089, 1125, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
|
||||||
|
+ /* 1920x1080@100Hz */
|
||||||
|
+ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2448,
|
||||||
|
+ 2492, 2640, 0, 1080, 1084, 1094, 1125, 0,
|
||||||
|
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
|
||||||
|
+};
|
||||||
|
+static const int drm_num_cea_modes =
|
||||||
|
+ sizeof (edid_cea_modes) / sizeof (edid_cea_modes[0]);
|
||||||
@ -24,7 +24,7 @@ PKG_REV="1"
|
|||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://www.kernel.org/pub/software/network/ethtool/"
|
PKG_SITE="http://www.kernel.org/pub/software/network/ethtool/"
|
||||||
PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
PKG_URL="http://ftp.uni-frankfurt.de/kernel/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||||
#PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
#PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||||
PKG_DEPENDS=""
|
PKG_DEPENDS=""
|
||||||
PKG_BUILD_DEPENDS="toolchain"
|
PKG_BUILD_DEPENDS="toolchain"
|
||||||
|
|||||||
@ -29,6 +29,7 @@ cd $PKG_BUILD
|
|||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
|
--disable-cli \
|
||||||
|
|
||||||
make
|
make
|
||||||
|
|
||||||
|
|||||||
@ -23,4 +23,5 @@
|
|||||||
. config/options $1
|
. config/options $1
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/lib
|
mkdir -p $INSTALL/usr/lib
|
||||||
cp -P $PKG_BUILD/lib/*.so* $INSTALL/usr/lib/
|
cp -P $PKG_BUILD/lib/.libs/libnl-*.so* $INSTALL/usr/lib/
|
||||||
|
rm -rf $INSTALL/usr/lib/libnl-*.so*T
|
||||||
@ -19,12 +19,12 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="libnl"
|
PKG_NAME="libnl"
|
||||||
PKG_VERSION="1.1"
|
PKG_VERSION="3.2.3"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="LGPL"
|
PKG_LICENSE="LGPL"
|
||||||
PKG_SITE="http://people.suug.ch/~tgr/libnl/"
|
PKG_SITE="http://people.suug.ch/~tgr/libnl/"
|
||||||
PKG_URL="https://launchpad.net/ubuntu/hardy/+source/libnl/1.1-1/+files/${PKG_NAME}_${PKG_VERSION}.orig.tar.gz"
|
PKG_URL="http://www.infradead.org/~tgr/libnl/files/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||||
PKG_DEPENDS=""
|
PKG_DEPENDS=""
|
||||||
PKG_BUILD_DEPENDS="toolchain"
|
PKG_BUILD_DEPENDS="toolchain"
|
||||||
PKG_PRIORITY="optional"
|
PKG_PRIORITY="optional"
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
diff -Naur libnl-1.1/include/netlink-local.h libnl-1.1.patch/include/netlink-local.h
|
|
||||||
--- libnl-1.1/include/netlink-local.h 2008-01-14 16:48:45.000000000 +0100
|
|
||||||
+++ libnl-1.1.patch/include/netlink-local.h 2010-04-13 20:34:38.502955161 +0200
|
|
||||||
@@ -15,6 +15,7 @@
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
+#include <limits.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
@ -43,8 +43,8 @@
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p /var/log/samba
|
mkdir -p /var/log/samba
|
||||||
smbd --daemon $SMB_ARG > /dev/null 2>&1
|
|
||||||
nmbd --daemon $SMB_ARG > /dev/null 2>&1
|
nmbd --daemon $SMB_ARG > /dev/null 2>&1
|
||||||
|
smbd --daemon $SMB_ARG > /dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
)&
|
)&
|
||||||
|
|||||||
@ -26,8 +26,10 @@ cd $PKG_BUILD/$1
|
|||||||
|
|
||||||
cp $ROOT/$PKG_DIR/config/makefile.config .config
|
cp $ROOT/$PKG_DIR/config/makefile.config .config
|
||||||
|
|
||||||
|
echo "CFLAGS += $TARGET_CFLAGS -I$SYSROOT_PREFIX/usr/include/libnl3/" >> .config
|
||||||
# echo "CONFIG_TLS=gnutls" >> .config
|
# echo "CONFIG_TLS=gnutls" >> .config
|
||||||
# echo "CONFIG_GNUTLS_EXTRA=y" >> .config
|
# echo "CONFIG_GNUTLS_EXTRA=y" >> .config
|
||||||
|
echo "CONFIG_LIBNL20=y" >> .config
|
||||||
[ ! "$DEBUG" = "yes" ] && echo "CONFIG_NO_STDOUT_DEBUG=y" >> .config
|
[ ! "$DEBUG" = "yes" ] && echo "CONFIG_NO_STDOUT_DEBUG=y" >> .config
|
||||||
|
|
||||||
make LIBDIR=/usr/lib BINDIR=/usr/bin
|
make LIBDIR=/usr/lib BINDIR=/usr/bin
|
||||||
|
|||||||
@ -0,0 +1,16 @@
|
|||||||
|
diff -Naur wpa_supplicant-0.7.3/src/drivers/drivers.mak wpa_supplicant-0.7.3.patch/src/drivers/drivers.mak
|
||||||
|
--- wpa_supplicant-0.7.3/src/drivers/drivers.mak 2010-09-07 17:43:39.000000000 +0200
|
||||||
|
+++ wpa_supplicant-0.7.3.patch/src/drivers/drivers.mak 2011-11-30 13:37:22.187964539 +0100
|
||||||
|
@@ -31,10 +31,10 @@
|
||||||
|
NEED_AP_MLME=y
|
||||||
|
NEED_NETLINK=y
|
||||||
|
NEED_LINUX_IOCTL=y
|
||||||
|
-DRV_LIBS += -lnl
|
||||||
|
+DRV_LIBS += -lnl-3
|
||||||
|
|
||||||
|
ifdef CONFIG_LIBNL20
|
||||||
|
-DRV_LIBS += -lnl-genl
|
||||||
|
+DRV_LIBS += -lnl-genl-3
|
||||||
|
DRV_CFLAGS += -DCONFIG_LIBNL20
|
||||||
|
endif
|
||||||
|
endif
|
||||||
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="freetype"
|
PKG_NAME="freetype"
|
||||||
PKG_VERSION="2.4.7"
|
PKG_VERSION="2.4.8"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
|||||||
@ -38,6 +38,7 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`"
|
|||||||
mkdir -p $INSTALL/usr/bin
|
mkdir -p $INSTALL/usr/bin
|
||||||
cp $PKG_DIR/scripts/createlog $INSTALL/usr/bin/
|
cp $PKG_DIR/scripts/createlog $INSTALL/usr/bin/
|
||||||
cp $PKG_DIR/scripts/lsb_release $INSTALL/usr/bin/
|
cp $PKG_DIR/scripts/lsb_release $INSTALL/usr/bin/
|
||||||
|
ln -sf /bin/busybox $INSTALL/usr/bin/env #/usr/bin/env is needed for most python scripts
|
||||||
|
|
||||||
mkdir -p $INSTALL/sbin
|
mkdir -p $INSTALL/sbin
|
||||||
cp $PKG_DIR/scripts/init $INSTALL/sbin/
|
cp $PKG_DIR/scripts/init $INSTALL/sbin/
|
||||||
|
|||||||
@ -25,7 +25,7 @@ PKG_ARCH="any"
|
|||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://mj.ucw.cz/pciutils.shtml"
|
PKG_SITE="http://mj.ucw.cz/pciutils.shtml"
|
||||||
#PKG_URL="http://ftp.de.kernel.org/pub/software/utils/pciutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
#PKG_URL="http://ftp.de.kernel.org/pub/software/utils/pciutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||||
PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/software/utils/pciutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
PKG_URL="http://ftp.uni-frankfurt.de/kernel/software/utils/pciutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||||
PKG_DEPENDS=""
|
PKG_DEPENDS=""
|
||||||
PKG_BUILD_DEPENDS="toolchain"
|
PKG_BUILD_DEPENDS="toolchain"
|
||||||
PKG_PRIORITY="optional"
|
PKG_PRIORITY="optional"
|
||||||
|
|||||||
@ -0,0 +1,12 @@
|
|||||||
|
diff -Naur eventlircd-42/udev/wakeup_enable.in eventlircd-42.patch/udev/wakeup_enable.in
|
||||||
|
--- eventlircd-42/udev/wakeup_enable.in 2011-04-01 16:42:27.000000000 +0200
|
||||||
|
+++ eventlircd-42.patch/udev/wakeup_enable.in 2011-11-28 02:05:59.743690557 +0100
|
||||||
|
@@ -4,7 +4,7 @@
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
devpath=`readlink -f "/sys/${DEVPATH}"`
|
||||||
|
-while echo "${devpath}" | /bin/grep -q '^/sys/devices/' > /dev/null 2>&1 ; do
|
||||||
|
+while echo "${devpath}" | grep -q '^/sys/devices/' > /dev/null 2>&1 ; do
|
||||||
|
if test -e "${devpath}/power/wakeup" ; then
|
||||||
|
state=`cat "${devpath}/power/wakeup"`
|
||||||
|
if test "x${state}" = "xdisabled" ; then
|
||||||
@ -19,14 +19,14 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="binutils"
|
PKG_NAME="binutils"
|
||||||
PKG_VERSION="2.21.52.0.2"
|
PKG_VERSION="2.22"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://www.gnu.org/software/binutils/binutils.html"
|
PKG_SITE="http://www.gnu.org/software/binutils/binutils.html"
|
||||||
PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
#PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||||
#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||||
#PKG_URL="http://ftp.gnu.org/gnu/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
PKG_URL="http://ftp.gnu.org/gnu/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||||
#PKG_URL="ftp://ftp.kernel.org/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
#PKG_URL="ftp://ftp.kernel.org/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||||
PKG_DEPENDS=""
|
PKG_DEPENDS=""
|
||||||
PKG_BUILD_DEPENDS="ccache bison flex linux-headers gmp-host mpfr ppl cloog-ppl libelf"
|
PKG_BUILD_DEPENDS="ccache bison flex linux-headers gmp-host mpfr ppl cloog-ppl libelf"
|
||||||
|
|||||||
@ -391,3 +391,169 @@ diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c
|
|||||||
native_types ();
|
native_types ();
|
||||||
hexadecimal ();
|
hexadecimal ();
|
||||||
binary ();
|
binary ();
|
||||||
|
diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
|
||||||
|
--- mpfr-3.1.0-a/PATCHES 2011-11-28 12:22:52.000000000 +0000
|
||||||
|
+++ mpfr-3.1.0-b/PATCHES 2011-11-28 12:22:52.000000000 +0000
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+gmp41compat
|
||||||
|
diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
|
||||||
|
--- mpfr-3.1.0-a/VERSION 2011-11-03 15:15:11.000000000 +0000
|
||||||
|
+++ mpfr-3.1.0-b/VERSION 2011-11-28 12:22:52.000000000 +0000
|
||||||
|
@@ -1 +1 @@
|
||||||
|
-3.1.0-p3
|
||||||
|
+3.1.0-p4
|
||||||
|
diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info
|
||||||
|
--- mpfr-3.1.0-a/doc/mpfr.info 2011-10-03 09:43:04.000000000 +0000
|
||||||
|
+++ mpfr-3.1.0-b/doc/mpfr.info 2011-11-28 12:22:52.000000000 +0000
|
||||||
|
@@ -2994,11 +2994,12 @@
|
||||||
|
|
||||||
|
* `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1. Their
|
||||||
|
behavior no longer depends on the platform (assuming this is also
|
||||||
|
- true for GMP's random generator). As a consequence, the returned
|
||||||
|
- values can be different between MPFR 3.1 and previous MPFR
|
||||||
|
- versions. Note: as the reproducibility of these functions was not
|
||||||
|
- specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded
|
||||||
|
- as backward incompatible with previous versions.
|
||||||
|
+ true for GMP's random generator, which is not the case between GMP
|
||||||
|
+ 4.1 and 4.2 if `gmp_randinit_default' is used). As a consequence,
|
||||||
|
+ the returned values can be different between MPFR 3.1 and previous
|
||||||
|
+ MPFR versions. Note: as the reproducibility of these functions
|
||||||
|
+ was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_
|
||||||
|
+ regarded as backward incompatible with previous versions.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@@ -4239,13 +4240,13 @@
|
||||||
|
Node: Type and Macro Changes129308
|
||||||
|
Node: Added Functions132029
|
||||||
|
Node: Changed Functions134972
|
||||||
|
-Node: Removed Functions139167
|
||||||
|
-Node: Other Changes139579
|
||||||
|
-Node: Contributors141108
|
||||||
|
-Node: References143574
|
||||||
|
-Node: GNU Free Documentation License145315
|
||||||
|
-Node: Concept Index167758
|
||||||
|
-Node: Function and Type Index173677
|
||||||
|
+Node: Removed Functions139253
|
||||||
|
+Node: Other Changes139665
|
||||||
|
+Node: Contributors141194
|
||||||
|
+Node: References143660
|
||||||
|
+Node: GNU Free Documentation License145401
|
||||||
|
+Node: Concept Index167844
|
||||||
|
+Node: Function and Type Index173763
|
||||||
|
|
||||||
|
End Tag Table
|
||||||
|
|
||||||
|
diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi
|
||||||
|
--- mpfr-3.1.0-a/doc/mpfr.texi 2011-10-03 08:17:14.000000000 +0000
|
||||||
|
+++ mpfr-3.1.0-b/doc/mpfr.texi 2011-11-28 12:22:52.000000000 +0000
|
||||||
|
@@ -3466,8 +3466,9 @@
|
||||||
|
a lack of specification.
|
||||||
|
|
||||||
|
@item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1.
|
||||||
|
-Their behavior no longer depends on the platform (assuming this is also
|
||||||
|
-true for GMP's random generator). As a consequence, the returned values
|
||||||
|
+Their behavior no longer depends on the platform (assuming this is also true
|
||||||
|
+for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if
|
||||||
|
+@code{gmp_randinit_default} is used). As a consequence, the returned values
|
||||||
|
can be different between MPFR 3.1 and previous MPFR versions.
|
||||||
|
Note: as the reproducibility of these functions was not specified
|
||||||
|
before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as
|
||||||
|
diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
|
||||||
|
--- mpfr-3.1.0-a/src/mpfr.h 2011-11-03 15:15:11.000000000 +0000
|
||||||
|
+++ mpfr-3.1.0-b/src/mpfr.h 2011-11-28 12:22:52.000000000 +0000
|
||||||
|
@@ -27,7 +27,7 @@
|
||||||
|
#define MPFR_VERSION_MAJOR 3
|
||||||
|
#define MPFR_VERSION_MINOR 1
|
||||||
|
#define MPFR_VERSION_PATCHLEVEL 0
|
||||||
|
-#define MPFR_VERSION_STRING "3.1.0-p3"
|
||||||
|
+#define MPFR_VERSION_STRING "3.1.0-p4"
|
||||||
|
|
||||||
|
/* Macros dealing with MPFR VERSION */
|
||||||
|
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
||||||
|
diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
|
||||||
|
--- mpfr-3.1.0-a/src/version.c 2011-11-03 15:15:11.000000000 +0000
|
||||||
|
+++ mpfr-3.1.0-b/src/version.c 2011-11-28 12:22:52.000000000 +0000
|
||||||
|
@@ -25,5 +25,5 @@
|
||||||
|
const char *
|
||||||
|
mpfr_get_version (void)
|
||||||
|
{
|
||||||
|
- return "3.1.0-p3";
|
||||||
|
+ return "3.1.0-p4";
|
||||||
|
}
|
||||||
|
diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c
|
||||||
|
--- mpfr-3.1.0-a/tests/trandom.c 2011-10-03 08:17:14.000000000 +0000
|
||||||
|
+++ mpfr-3.1.0-b/tests/trandom.c 2011-11-28 12:22:52.000000000 +0000
|
||||||
|
@@ -114,21 +114,29 @@
|
||||||
|
mpfr_t x;
|
||||||
|
gmp_randstate_t s;
|
||||||
|
|
||||||
|
+#if __MPFR_GMP(4,2,0)
|
||||||
|
+# define C1 "0.895943"
|
||||||
|
+# define C2 "0.848824"
|
||||||
|
+#else
|
||||||
|
+# define C1 "0.479652"
|
||||||
|
+# define C2 "0.648529"
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
gmp_randinit_default (s);
|
||||||
|
gmp_randseed_ui (s, 42);
|
||||||
|
mpfr_init2 (x, 17);
|
||||||
|
mpfr_urandomb (x, s);
|
||||||
|
- if (mpfr_cmp_str1 (x, "0.895943") != 0)
|
||||||
|
+ if (mpfr_cmp_str1 (x, C1) != 0)
|
||||||
|
{
|
||||||
|
- printf ("Error in bug20100914, expected 0.895943, got ");
|
||||||
|
+ printf ("Error in bug20100914, expected " C1 ", got ");
|
||||||
|
mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
|
||||||
|
printf ("\n");
|
||||||
|
exit (1);
|
||||||
|
}
|
||||||
|
mpfr_urandomb (x, s);
|
||||||
|
- if (mpfr_cmp_str1 (x, "0.848824") != 0)
|
||||||
|
+ if (mpfr_cmp_str1 (x, C2) != 0)
|
||||||
|
{
|
||||||
|
- printf ("Error in bug20100914, expected 0.848824, got ");
|
||||||
|
+ printf ("Error in bug20100914, expected " C2 ", got ");
|
||||||
|
mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
|
||||||
|
printf ("\n");
|
||||||
|
exit (1);
|
||||||
|
diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c
|
||||||
|
--- mpfr-3.1.0-a/tests/turandom.c 2011-10-03 08:17:14.000000000 +0000
|
||||||
|
+++ mpfr-3.1.0-b/tests/turandom.c 2011-11-28 12:22:52.000000000 +0000
|
||||||
|
@@ -160,23 +160,29 @@
|
||||||
|
mpfr_t x;
|
||||||
|
gmp_randstate_t s;
|
||||||
|
|
||||||
|
+#if __MPFR_GMP(4,2,0)
|
||||||
|
+# define C1 "0.8488312"
|
||||||
|
+# define C2 "0.8156509"
|
||||||
|
+#else
|
||||||
|
+# define C1 "0.6485367"
|
||||||
|
+# define C2 "0.9362717"
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
gmp_randinit_default (s);
|
||||||
|
gmp_randseed_ui (s, 42);
|
||||||
|
mpfr_init2 (x, 17);
|
||||||
|
mpfr_urandom (x, s, MPFR_RNDN);
|
||||||
|
- /* the following values are obtained on a 32-bit computer, we should get
|
||||||
|
- the same values on a 64-bit computer */
|
||||||
|
- if (mpfr_cmp_str1 (x, "0.8488312") != 0)
|
||||||
|
+ if (mpfr_cmp_str1 (x, C1) != 0)
|
||||||
|
{
|
||||||
|
- printf ("Error in bug20100914, expected 0.8488312, got ");
|
||||||
|
+ printf ("Error in bug20100914, expected " C1 ", got ");
|
||||||
|
mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
|
||||||
|
printf ("\n");
|
||||||
|
exit (1);
|
||||||
|
}
|
||||||
|
mpfr_urandom (x, s, MPFR_RNDN);
|
||||||
|
- if (mpfr_cmp_str1 (x, "0.8156509") != 0)
|
||||||
|
+ if (mpfr_cmp_str1 (x, C2) != 0)
|
||||||
|
{
|
||||||
|
- printf ("Error in bug20100914, expected 0.8156509, got ");
|
||||||
|
+ printf ("Error in bug20100914, expected " C2 ", got ");
|
||||||
|
mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
|
||||||
|
printf ("\n");
|
||||||
|
exit (1);
|
||||||
@ -22,6 +22,8 @@
|
|||||||
|
|
||||||
. config/options $1
|
. config/options $1
|
||||||
|
|
||||||
|
export LDFLAGS="$LDFLAGS -ltinfo"
|
||||||
|
|
||||||
cd $PKG_BUILD
|
cd $PKG_BUILD
|
||||||
|
|
||||||
# dialog fails to build with GOLD linker
|
# dialog fails to build with GOLD linker
|
||||||
|
|||||||
@ -19,13 +19,13 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="dialog"
|
PKG_NAME="dialog"
|
||||||
PKG_VERSION="1.1-20110302"
|
PKG_VERSION="1.1-20111020"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://invisible-island.net/dialog/"
|
PKG_SITE="http://invisible-island.net/dialog/"
|
||||||
#PKG_URL="ftp://invisible-island.net/dialog/$PKG_NAME-$PKG_VERSION.tgz"
|
PKG_URL="ftp://invisible-island.net/dialog/$PKG_NAME-$PKG_VERSION.tgz"
|
||||||
PKG_URL="http://ftp.netbsd.org/pub/NetBSD/packages/distfiles/$PKG_NAME-$PKG_VERSION.tgz"
|
#PKG_URL="http://ftp.netbsd.org/pub/NetBSD/packages/distfiles/$PKG_NAME-$PKG_VERSION.tgz"
|
||||||
PKG_DEPENDS="ncurses"
|
PKG_DEPENDS="ncurses"
|
||||||
PKG_BUILD_DEPENDS="toolchain ncurses"
|
PKG_BUILD_DEPENDS="toolchain ncurses"
|
||||||
PKG_PRIORITY="optional"
|
PKG_PRIORITY="optional"
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="curl"
|
PKG_NAME="curl"
|
||||||
PKG_VERSION="7.22.0"
|
PKG_VERSION="7.23.1"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="MIT"
|
PKG_LICENSE="MIT"
|
||||||
|
|||||||
@ -1,41 +0,0 @@
|
|||||||
lib/multi.c | 17 ++++++++++++++++-
|
|
||||||
1 files changed, 16 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/lib/multi.c b/lib/multi.c
|
|
||||||
index 476cb81..74eb0f4 100644
|
|
||||||
--- a/lib/multi.c
|
|
||||||
+++ b/lib/multi.c
|
|
||||||
@@ -933,9 +933,16 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
|
|
||||||
easy->result = addHandleToSendOrPendPipeline(easy->easy_handle,
|
|
||||||
easy->easy_conn);
|
|
||||||
if(CURLE_OK == easy->result) {
|
|
||||||
- if(async)
|
|
||||||
+ if(async) {
|
|
||||||
/* We're now waiting for an asynchronous name lookup */
|
|
||||||
multistate(easy, CURLM_STATE_WAITRESOLVE);
|
|
||||||
+#ifdef USE_THREADS_POSIX
|
|
||||||
+ /* Curl_resolv_getsock() is not properly implemented in case
|
|
||||||
+ * we use POSIX threaded DNS resolver, we have to hang */
|
|
||||||
+ result = CURLM_CALL_MULTI_PERFORM;
|
|
||||||
+ break;
|
|
||||||
+#endif
|
|
||||||
+ }
|
|
||||||
else {
|
|
||||||
/* after the connect has been sent off, go WAITCONNECT unless the
|
|
||||||
protocol connect is already done and we can go directly to
|
|
||||||
@@ -1003,6 +1010,14 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
|
|
||||||
disconnect_conn = TRUE;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
+#ifdef USE_THREADS_POSIX
|
|
||||||
+ /* Curl_resolv_getsock() is not properly implemented yet in case
|
|
||||||
+ * we use POSIX threaded DNS resolver, we have to hang */
|
|
||||||
+ Curl_socket_ready(CURL_SOCKET_BAD, CURL_SOCKET_BAD, 100 /* ms */);
|
|
||||||
+ result = CURLM_CALL_MULTI_PERFORM;
|
|
||||||
+ break;
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
|
|
||||||
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="xf86-video-nvidia"
|
PKG_NAME="xf86-video-nvidia"
|
||||||
PKG_VERSION="290.06"
|
PKG_VERSION="290.10"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="i386 x86_64"
|
PKG_ARCH="i386 x86_64"
|
||||||
PKG_LICENSE="nonfree"
|
PKG_LICENSE="nonfree"
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="xorg-server"
|
PKG_NAME="xorg-server"
|
||||||
PKG_VERSION="1.10.4"
|
PKG_VERSION="1.11.2"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="OSS"
|
PKG_LICENSE="OSS"
|
||||||
|
|||||||
@ -1,100 +0,0 @@
|
|||||||
From a685b5cf34532cef96fc9b05f735088ac0c0c7ad Mon Sep 17 00:00:00 2001
|
|
||||||
From: Fedora X Ninjas <x@fedoraproject.org>
|
|
||||||
Date: Tue, 16 Feb 2010 11:38:17 +1000
|
|
||||||
Subject: [PATCH 08/17] autoconfig: select nouveau by default for NVIDIA GPUs
|
|
||||||
|
|
||||||
Also, don't treat DRI setup failure as an error for nouveau.
|
|
||||||
---
|
|
||||||
glx/glxdri.c | 7 +++++--
|
|
||||||
glx/glxdri2.c | 7 +++++--
|
|
||||||
hw/xfree86/common/xf86AutoConfig.c | 19 ++++++++++++++++++-
|
|
||||||
3 files changed, 28 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
--- a/glx/glxdri.c
|
|
||||||
+++ b/glx/glxdri.c
|
|
||||||
@@ -979,6 +979,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
|
|
||||||
const __DRIconfig **driConfigs;
|
|
||||||
const __DRIextension **extensions;
|
|
||||||
int i;
|
|
||||||
+ int from = X_ERROR;
|
|
||||||
|
|
||||||
if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
|
|
||||||
!DRIQueryDirectRenderingCapable(pScreen, &isCapable) ||
|
|
||||||
@@ -1058,7 +1059,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
|
|
||||||
|
|
||||||
screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
|
|
||||||
if (screen->driver == NULL) {
|
|
||||||
- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
|
|
||||||
+ if (!strcmp(driverName, "nouveau"))
|
|
||||||
+ from = X_INFO;
|
|
||||||
+ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n",
|
|
||||||
filename, dlerror());
|
|
||||||
goto handle_error;
|
|
||||||
}
|
|
||||||
@@ -1196,7 +1199,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
|
|
||||||
|
|
||||||
free(screen);
|
|
||||||
|
|
||||||
- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
|
|
||||||
+ LogMessage(from, "AIGLX: reverting to software rendering\n");
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
--- a/glx/glxdri2.c
|
|
||||||
+++ b/glx/glxdri2.c
|
|
||||||
@@ -709,6 +709,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
|
|
||||||
const __DRIextension **extensions;
|
|
||||||
const __DRIconfig **driConfigs;
|
|
||||||
int i;
|
|
||||||
+ int from = X_ERROR;
|
|
||||||
|
|
||||||
screen = calloc(1, sizeof *screen);
|
|
||||||
if (screen == NULL)
|
|
||||||
@@ -735,7 +736,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
|
|
||||||
|
|
||||||
screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
|
|
||||||
if (screen->driver == NULL) {
|
|
||||||
- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
|
|
||||||
+ if (!strcmp(driverName, "nouveau"))
|
|
||||||
+ from = X_INFO;
|
|
||||||
+ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n",
|
|
||||||
filename, dlerror());
|
|
||||||
goto handle_error;
|
|
||||||
}
|
|
||||||
@@ -829,7 +832,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
|
|
||||||
|
|
||||||
free(screen);
|
|
||||||
|
|
||||||
- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
|
|
||||||
+ LogMessage(from, "AIGLX: reverting to software rendering\n");
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
--- a/hw/xfree86/common/xf86pciBus.c
|
|
||||||
+++ b/hw/xfree86/common/xf86pciBus.c
|
|
||||||
@@ -1118,7 +1118,24 @@ videoPtrToDriverList(struct pci_device *
|
|
||||||
break;
|
|
||||||
case 0x102b: driverList[0] = "mga"; break;
|
|
||||||
case 0x10c8: driverList[0] = "neomagic"; break;
|
|
||||||
- case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
|
|
||||||
+ case 0x10de: case 0x12d2:
|
|
||||||
+ switch (dev->device_id) {
|
|
||||||
+ /* NV1 */
|
|
||||||
+ case 0x0008:
|
|
||||||
+ case 0x0009:
|
|
||||||
+ driverList[0] = "vesa";
|
|
||||||
+ break;
|
|
||||||
+ /* NV3 */
|
|
||||||
+ case 0x0018:
|
|
||||||
+ case 0x0019:
|
|
||||||
+ driverList[0] = "nv";
|
|
||||||
+ break;
|
|
||||||
+ default:
|
|
||||||
+ driverList[0] = "nouveau";
|
|
||||||
+ driverList[1] = "nv";
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ break;
|
|
||||||
case 0x1106: driverList[0] = "openchrome"; break;
|
|
||||||
case 0x1b36: driverList[0] = "qxl"; break;
|
|
||||||
case 0x1163: driverList[0] = "rendition"; break;
|
|
||||||
@ -1,86 +0,0 @@
|
|||||||
From 0366a844c36bf8424a2625425c181b9b97f35bee Mon Sep 17 00:00:00 2001
|
|
||||||
From: Robert Hooker <sarvatt@ubuntu.com>
|
|
||||||
Date: Wed, 1 Sep 2010 13:23:21 -0400
|
|
||||||
Subject: [PATCH] Attempt to get nvidia and fglrx working without an xorg.conf.
|
|
||||||
|
|
||||||
Signed-off-by: Robert Hooker <sarvatt@ubuntu.com>
|
|
||||||
---
|
|
||||||
hw/xfree86/common/xf86AutoConfig.c | 12 +++++++++++-
|
|
||||||
hw/xfree86/common/xf86pciBus.c | 14 +++++++++-----
|
|
||||||
2 files changed, 20 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
|
|
||||||
index 8ef602d..a8f04b9 100644
|
|
||||||
--- a/hw/xfree86/common/xf86AutoConfig.c
|
|
||||||
+++ b/hw/xfree86/common/xf86AutoConfig.c
|
|
||||||
@@ -81,6 +81,13 @@
|
|
||||||
"\tDevice\t" BUILTIN_DEVICE_NAME "\n" \
|
|
||||||
"EndSection\n\n"
|
|
||||||
|
|
||||||
+#define BUILTIN_SCREEN_SECTION_PROPRIETARY \
|
|
||||||
+ "Section \"Screen\"\n" \
|
|
||||||
+ "\tIdentifier\t" BUILTIN_SCREEN_NAME "\n" \
|
|
||||||
+ "\tDevice\t" BUILTIN_DEVICE_NAME "\n" \
|
|
||||||
+ "\tDefaultDepth\t24\n" \
|
|
||||||
+ "EndSection\n\n"
|
|
||||||
+
|
|
||||||
#define BUILTIN_LAYOUT_SECTION_PRE \
|
|
||||||
"Section \"ServerLayout\"\n" \
|
|
||||||
"\tIdentifier\t\"Builtin Default Layout\"\n"
|
|
||||||
@@ -159,7 +166,10 @@ xf86AutoConfig(void)
|
|
||||||
for (p = deviceList; *p; p++) {
|
|
||||||
snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
|
|
||||||
AppendToConfig(buf);
|
|
||||||
- snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);
|
|
||||||
+ if( strcmp(*p, "fglrx") == 0 || strcmp(*p, "nvidia") == 0)
|
|
||||||
+ snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION_PROPRIETARY, *p, 0, *p, 0);
|
|
||||||
+ else
|
|
||||||
+ snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);
|
|
||||||
AppendToConfig(buf);
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
|
|
||||||
index 930ed83..a6aa4f4 100644
|
|
||||||
--- a/hw/xfree86/common/xf86pciBus.c
|
|
||||||
+++ b/hw/xfree86/common/xf86pciBus.c
|
|
||||||
@@ -1102,7 +1102,10 @@ videoPtrToDriverList(struct pci_device *dev,
|
|
||||||
case 0x1142: driverList[0] = "apm"; break;
|
|
||||||
case 0xedd8: driverList[0] = "ark"; break;
|
|
||||||
case 0x1a03: driverList[0] = "ast"; break;
|
|
||||||
- case 0x1002: driverList[0] = "ati"; break;
|
|
||||||
+ case 0x1002:
|
|
||||||
+ driverList[0] = "fglrx";
|
|
||||||
+ driverList[1] = "ati";
|
|
||||||
+ break;
|
|
||||||
case 0x102c: driverList[0] = "chips"; break;
|
|
||||||
case 0x1013: driverList[0] = "cirrus"; break;
|
|
||||||
case 0x3d3d: driverList[0] = "glint"; break;
|
|
||||||
@@ -1119,20 +1122,21 @@ videoPtrToDriverList(struct pci_device *dev,
|
|
||||||
case 0x102b: driverList[0] = "mga"; break;
|
|
||||||
case 0x10c8: driverList[0] = "neomagic"; break;
|
|
||||||
case 0x10de: case 0x12d2:
|
|
||||||
+ driverList[0] = "nvidia";
|
|
||||||
switch (dev->device_id) {
|
|
||||||
/* NV1 */
|
|
||||||
case 0x0008:
|
|
||||||
case 0x0009:
|
|
||||||
- driverList[0] = "vesa";
|
|
||||||
+ driverList[1] = "vesa";
|
|
||||||
break;
|
|
||||||
/* NV3 */
|
|
||||||
case 0x0018:
|
|
||||||
case 0x0019:
|
|
||||||
- driverList[0] = "nv";
|
|
||||||
+ driverList[1] = "nv";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
- driverList[0] = "nouveau";
|
|
||||||
- driverList[1] = "nv";
|
|
||||||
+ driverList[1] = "nouveau";
|
|
||||||
+ driverList[2] = "nv";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
--
|
|
||||||
1.7.2
|
|
||||||
|
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
diff -Naur xorg-server-1.11.0-old/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.0-new/hw/xfree86/common/xf86pciBus.c
|
||||||
|
--- xorg-server-1.11.0-old/hw/xfree86/common/xf86pciBus.c 2011-08-27 09:46:27.000000000 -0700
|
||||||
|
+++ xorg-server-1.11.0-new/hw/xfree86/common/xf86pciBus.c 2011-08-27 09:47:09.000000000 -0700
|
||||||
|
@@ -1123,7 +1123,7 @@
|
||||||
|
break;
|
||||||
|
case 0x102b: driverList[0] = "mga"; break;
|
||||||
|
case 0x10c8: driverList[0] = "neomagic"; break;
|
||||||
|
- case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
|
||||||
|
+ case 0x10de: case 0x12d2: driverList[0] = "nouveau"; break;
|
||||||
|
case 0x1106: driverList[0] = "openchrome"; break;
|
||||||
|
case 0x1b36: driverList[0] = "qxl"; break;
|
||||||
|
case 0x1163: driverList[0] = "rendition"; break;
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
diff -Naur xorg-server-1.11.0-old/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.0-new/hw/xfree86/common/xf86pciBus.c
|
||||||
|
--- xorg-server-1.11.0-old/hw/xfree86/common/xf86pciBus.c 2011-08-27 09:47:09.000000000 -0700
|
||||||
|
+++ xorg-server-1.11.0-new/hw/xfree86/common/xf86pciBus.c 2011-08-27 09:47:33.000000000 -0700
|
||||||
|
@@ -1107,7 +1107,7 @@
|
||||||
|
case 0x1142: driverList[0] = "apm"; break;
|
||||||
|
case 0xedd8: driverList[0] = "ark"; break;
|
||||||
|
case 0x1a03: driverList[0] = "ast"; break;
|
||||||
|
- case 0x1002: driverList[0] = "ati"; break;
|
||||||
|
+ case 0x1002: driverList[0] = "radeon"; break;
|
||||||
|
case 0x102c: driverList[0] = "chips"; break;
|
||||||
|
case 0x1013: driverList[0] = "cirrus"; break;
|
||||||
|
case 0x3d3d: driverList[0] = "glint"; break;
|
||||||
@ -72,6 +72,8 @@ if [ "$RUNLEVEL" = openelec ]; then
|
|||||||
chown root:root /tmp/.ICE-unix
|
chown root:root /tmp/.ICE-unix
|
||||||
|
|
||||||
if [ "${xorg_driver}" = "nvidia" ]; then
|
if [ "${xorg_driver}" = "nvidia" ]; then
|
||||||
|
export __GL_SHADER_DISK_CACHE=1
|
||||||
|
export __GL_SHADER_DISK_CACHE_PATH="/tmp/GLCache"
|
||||||
ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
|
ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
|
||||||
ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
|
ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
|
||||||
XORG_ARGS="$XORG_ARGS -ignoreABI"
|
XORG_ARGS="$XORG_ARGS -ignoreABI"
|
||||||
|
|||||||
@ -150,7 +150,7 @@
|
|||||||
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
||||||
# Space separated list is supported,
|
# Space separated list is supported,
|
||||||
# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
|
# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
|
||||||
ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d linux-tbs-drivers"
|
ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d"
|
||||||
|
|
||||||
# build with network support (yes / no)
|
# build with network support (yes / no)
|
||||||
NETWORK="yes"
|
NETWORK="yes"
|
||||||
|
|||||||
@ -150,7 +150,7 @@
|
|||||||
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
||||||
# Space separated list is supported,
|
# Space separated list is supported,
|
||||||
# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
|
# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
|
||||||
ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d linux-tbs-drivers"
|
ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d"
|
||||||
|
|
||||||
# build with network support (yes / no)
|
# build with network support (yes / no)
|
||||||
NETWORK="yes"
|
NETWORK="yes"
|
||||||
|
|||||||
@ -150,7 +150,7 @@
|
|||||||
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
||||||
# Space separated list is supported,
|
# Space separated list is supported,
|
||||||
# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
|
# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
|
||||||
ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d linux-tbs-drivers"
|
ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d"
|
||||||
|
|
||||||
# build with network support (yes / no)
|
# build with network support (yes / no)
|
||||||
NETWORK="yes"
|
NETWORK="yes"
|
||||||
|
|||||||
@ -150,7 +150,7 @@
|
|||||||
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
||||||
# Space separated list is supported,
|
# Space separated list is supported,
|
||||||
# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
|
# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
|
||||||
ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d linux-tbs-drivers"
|
ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d"
|
||||||
|
|
||||||
# build with network support (yes / no)
|
# build with network support (yes / no)
|
||||||
NETWORK="yes"
|
NETWORK="yes"
|
||||||
|
|||||||
@ -150,7 +150,7 @@
|
|||||||
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
||||||
# Space separated list is supported,
|
# Space separated list is supported,
|
||||||
# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
|
# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
|
||||||
ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d linux-tbs-drivers"
|
ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d"
|
||||||
|
|
||||||
# build with network support (yes / no)
|
# build with network support (yes / no)
|
||||||
NETWORK="yes"
|
NETWORK="yes"
|
||||||
|
|||||||
@ -150,7 +150,7 @@
|
|||||||
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
# asix-ax887xx: Asix AX887xx USB LAN Driver
|
||||||
# Space separated list is supported,
|
# Space separated list is supported,
|
||||||
# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
|
# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
|
||||||
ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d linux-tbs-drivers"
|
ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d"
|
||||||
|
|
||||||
# build with network support (yes / no)
|
# build with network support (yes / no)
|
||||||
NETWORK="yes"
|
NETWORK="yes"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user