rpmfusion-commits
December 2008
rpmfusion-commits@lists.rpmfusion.org
- 20 participants
- 432 discussions
rpms/wl-kmod/F-10 broadcom-wl-5.10.27.11-kernel-2.6.27.patch, NONE, 1.1 broadcom-wl-5.10.27.11-vlanmode.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wl-kmod.spec, 1.11, 1.12
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/wl-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7672
Modified Files:
.cvsignore sources wl-kmod.spec
Added Files:
broadcom-wl-5.10.27.11-kernel-2.6.27.patch
broadcom-wl-5.10.27.11-vlanmode.patch
Log Message:
* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
- Update version to 5.10.27.11
broadcom-wl-5.10.27.11-kernel-2.6.27.patch:
--- NEW FILE broadcom-wl-5.10.27.11-kernel-2.6.27.patch ---
diff -Naur broadcom-wl.old/src/wl/sys/wl_iw.c broadcom-wl/src/wl/sys/wl_iw.c
--- broadcom-wl.old/src/wl/sys/wl_iw.c 2008-12-05 19:45:54.000000000 +0000
+++ broadcom-wl/src/wl/sys/wl_iw.c 2008-12-22 14:03:42.000000000 +0000
@@ -943,12 +943,12 @@
iwe.cmd = SIOCGIWAP;
iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
memcpy(iwe.u.ap_addr.sa_data, &bi->BSSID, ETHER_ADDR_LEN);
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_ADDR_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_ADDR_LEN);
iwe.u.data.length = dtoh32(bi->SSID_len);
iwe.cmd = SIOCGIWESSID;
iwe.u.data.flags = 1;
- event = iwe_stream_add_point(event, end, &iwe, bi->SSID);
+ event = iwe_stream_add_point(info, event, end, &iwe, bi->SSID);
if (dtoh16(bi->capability) & (DOT11_CAP_ESS | DOT11_CAP_IBSS)) {
iwe.cmd = SIOCGIWMODE;
@@ -956,7 +956,7 @@
iwe.u.mode = IW_MODE_INFRA;
else
iwe.u.mode = IW_MODE_ADHOC;
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_UINT_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_UINT_LEN);
}
iwe.cmd = SIOCGIWFREQ;
@@ -964,13 +964,13 @@
CHSPEC_CHANNEL(bi->chanspec) <= CH_MAX_2G_CHANNEL ?
WF_CHAN_FACTOR_2_4_G : WF_CHAN_FACTOR_5_G);
iwe.u.freq.e = 6;
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_FREQ_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_FREQ_LEN);
iwe.cmd = IWEVQUAL;
iwe.u.qual.qual = rssi_to_qual(dtoh16(bi->RSSI));
iwe.u.qual.level = 0x100 + dtoh16(bi->RSSI);
iwe.u.qual.noise = 0x100 + bi->phy_noise;
- event = iwe_stream_add_event(event, end, &iwe, IW_EV_QUAL_LEN);
+ event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_QUAL_LEN);
#if WIRELESS_EXT > 17
@@ -982,7 +982,7 @@
if ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_RSN_ID))) {
iwe.cmd = IWEVGENIE;
iwe.u.data.length = ie->len + 2;
- event = iwe_stream_add_point(event, end, &iwe, (char *)ie);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)ie);
}
ptr = ((uint8 *)bi) + sizeof(wl_bss_info_t);
while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WPA_ID))) {
@@ -990,7 +990,7 @@
if (ie_is_wps_ie(((uint8 **)&ie), &ptr, &ptr_len)) {
iwe.cmd = IWEVGENIE;
iwe.u.data.length = ie->len + 2;
- event = iwe_stream_add_point(event, end, &iwe, (char *)ie);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)ie);
break;
}
}
@@ -1001,7 +1001,7 @@
if (ie_is_wpa_ie(((uint8 **)&ie), &ptr, &ptr_len)) {
iwe.cmd = IWEVGENIE;
iwe.u.data.length = ie->len + 2;
- event = iwe_stream_add_point(event, end, &iwe, (char *)ie);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)ie);
goto done;
}
}
@@ -1015,7 +1015,7 @@
else
iwe.u.data.flags = IW_ENCODE_DISABLED;
iwe.u.data.length = 0;
- event = iwe_stream_add_point(event, end, &iwe, (char *)event);
+ event = iwe_stream_add_point(info, event, end, &iwe, (char *)event);
if (bi->rateset.count) {
value = event + IW_EV_LCP_LEN;
@@ -1024,7 +1024,7 @@
iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
for (j = 0; j < bi->rateset.count && j < IW_MAX_BITRATES; j++) {
iwe.u.bitrate.value = (bi->rateset.rates[j] & 0x7f) * 500000;
- value = iwe_stream_add_value(event, value, end, &iwe,
+ value = iwe_stream_add_value(info, event, value, end, &iwe,
IW_EV_PARAM_LEN);
}
event = value;
broadcom-wl-5.10.27.11-vlanmode.patch:
--- NEW FILE broadcom-wl-5.10.27.11-vlanmode.patch ---
diff -Naur broadcom-wl.old/src/wl/sys/wl_iw.c broadcom-wl/src/wl/sys/wl_iw.c
--- broadcom-wl.old/src/wl/sys/wl_iw.c 2008-12-22 14:08:06.000000000 +0000
+++ broadcom-wl/src/wl/sys/wl_iw.c 2008-12-22 14:11:18.000000000 +0000
@@ -124,7 +124,7 @@
return ret;
}
-static int
+int
dev_wlc_intvar_set(
struct net_device *dev,
char *name,
diff -Naur broadcom-wl.old/src/wl/sys/wl_linux.c broadcom-wl/src/wl/sys/wl_linux.c
--- broadcom-wl.old/src/wl/sys/wl_linux.c 2008-12-05 19:46:08.000000000 +0000
+++ broadcom-wl/src/wl/sys/wl_linux.c 2008-12-22 14:17:13.000000000 +0000
@@ -246,6 +246,8 @@
};
MODULE_DEVICE_TABLE(pci, wl_id_table);
+MODULE_LICENSE("MIXED/Proprietary");
+
#ifdef BCMDBG
static int msglevel = 0xdeadbeef;
module_param(msglevel, int, 0);
@@ -288,6 +290,8 @@
#endif
#endif
}
+
+extern int dev_wlc_intvar_set(struct net_device *dev, char *name, int val);
static wl_info_t *
wl_attach(uint16 vendor, uint16 device, ulong regs, uint bustype, void *btparam, uint irq)
@@ -439,6 +443,9 @@
printf("%s: Broadcom BCM%04x 802.11 Wireless Controller " EPI_VERSION_STR,
dev->name, device);
+ /* Work around. Default vlan_mode to off */
+ wlc_iovar_setint(wl->wlc, "vlan_mode", OFF);
+
#ifdef BCMDBG
printf(" (Compiled in " SRCBASE " at " __TIME__ " on " __DATE__ ")");
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2008 11:49:32 -0000 1.2
+++ .cvsignore 31 Dec 2008 13:53:29 -0000 1.3
@@ -1,2 +1,2 @@
-hybrid-portsrc-x86_32_5_10_27_6.tar.gz
-hybrid-portsrc-x86_64_5_10_27_6.tar.gz
+hybrid-portsrc-x86-32_5_10_27_11.tar.gz
+hybrid-portsrc-x86-64_5_10_27_11.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2008 11:49:32 -0000 1.2
+++ sources 31 Dec 2008 13:53:29 -0000 1.3
@@ -1,2 +1,2 @@
-7f50d89179e637225bd97022b323c27e hybrid-portsrc-x86_32_5_10_27_6.tar.gz
-d61e5ad289fc5f0b62e0656f90b451a7 hybrid-portsrc-x86_64_5_10_27_6.tar.gz
+82c8f4312cf809fea2dcb175eb8e0036 hybrid-portsrc-x86-32_5_10_27_11.tar.gz
+78b403352902671252125d3fd00f8a22 hybrid-portsrc-x86-64_5_10_27_11.tar.gz
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-10/wl-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wl-kmod.spec 20 Dec 2008 08:04:06 -0000 1.11
+++ wl-kmod.spec 31 Dec 2008 13:53:29 -0000 1.12
@@ -3,20 +3,20 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#%define buildforkernels newest
Name: wl-kmod
-Version: 5.10.27.6
-Release: 5%{?dist}.8
+Version: 5.10.27.11
+Release: 1%{?dist}
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32_5_10_27_6.ta...
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64_5_10_27_6.ta...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86-32_5_10_27_11.t...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86-64_5_10_27_11.t...
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.10.27.6-kernel-2.6.27.patch
-Patch1: broadcom-wl-5.10.27.6-vlanmode.patch
+Patch0: broadcom-wl-5.10.27.11-kernel-2.6.27.patch
+Patch1: broadcom-wl-5.10.27.11-vlanmode.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -84,6 +84,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
+- Update version to 5.10.27.11
+
* Sat Dec 20 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.8
- rebuild for latest Fedora kernel;
15 years, 3 months
- 1
- 0
rpms/broadcom-wl/F-10 broadcom-wl.spec,1.3,1.4
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/broadcom-wl/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6013
Modified Files:
broadcom-wl.spec
Log Message:
* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
- Update version to 5.10.27.11
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-10/broadcom-wl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- broadcom-wl.spec 31 Dec 2008 13:22:20 -0000 1.3
+++ broadcom-wl.spec 31 Dec 2008 13:26:40 -0000 1.4
@@ -5,7 +5,7 @@
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32_5_10_27_11.t...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86-32_5_10_27_11.t...
Source1: http://www.broadcom.com/docs/linux_sta/README.txt
Source2: broadcom-wl-blacklist
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
15 years, 3 months
- 1
- 0
rpms/broadcom-wl/F-10 .cvsignore, 1.2, 1.3 broadcom-wl.spec, 1.2, 1.3 sources, 1.2, 1.3
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/broadcom-wl/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5603
Modified Files:
.cvsignore broadcom-wl.spec sources
Log Message:
* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
- Update version to 5.10.27.11
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 7 Nov 2008 21:01:54 -0000 1.2
+++ .cvsignore 31 Dec 2008 13:22:20 -0000 1.3
@@ -1 +1 @@
-hybrid-portsrc-x86_32_5_10_27_6.tar.gz
+hybrid-portsrc-x86-32_5_10_27_11.tar.gz
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-10/broadcom-wl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- broadcom-wl.spec 20 Dec 2008 12:53:59 -0000 1.2
+++ broadcom-wl.spec 31 Dec 2008 13:22:20 -0000 1.3
@@ -1,11 +1,11 @@
Name: broadcom-wl
-Version: 5.10.27.6
-Release: 4%{?dist}
+Version: 5.10.27.11
+Release: 1%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32_5_10_27_6.ta...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32_5_10_27_11.t...
Source1: http://www.broadcom.com/docs/linux_sta/README.txt
Source2: broadcom-wl-blacklist
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +46,9 @@
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist
%changelog
+* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
+- Update version to 5.10.27.11
+
* Sat Dec 20 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-4
- ExcludeArch ppc, ppc64
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 7 Nov 2008 21:01:54 -0000 1.2
+++ sources 31 Dec 2008 13:22:20 -0000 1.3
@@ -1 +1 @@
-7f50d89179e637225bd97022b323c27e hybrid-portsrc-x86_32_5_10_27_6.tar.gz
+82c8f4312cf809fea2dcb175eb8e0036 hybrid-portsrc-x86-32_5_10_27_11.tar.gz
15 years, 3 months
- 1
- 0
rpms/mythtv/F-9 mythplugins-0.21-svnfixes.patch, 1.4, 1.5 mythtv-0.21-svnfixes.patch, 1.4, 1.5 mythtv.spec, 1.8, 1.9
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28999
Modified Files:
mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch
mythtv.spec
Log Message:
* Tue Dec 30 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-16
- Update release-0-21-fixes patches (r19505)
- Fixes infinite loop introduced by firewire fix in -15 (rpmfusion bz#286)
mythplugins-0.21-svnfixes.patch:
Index: mythplugins-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-9/mythplugins-0.21-svnfixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mythplugins-0.21-svnfixes.patch 12 Dec 2008 03:49:51 -0000 1.4
+++ mythplugins-0.21-svnfixes.patch 31 Dec 2008 00:19:04 -0000 1.5
@@ -3978,6 +3978,20 @@
</message>
</context>
</TS>
+Index: mythplugins/mythmusic/mythmusic/playbackbox.cpp
+===================================================================
+--- mythplugins/mythmusic/mythmusic/playbackbox.cpp (revision 16468)
++++ mythplugins/mythmusic/mythmusic/playbackbox.cpp (working copy)
+@@ -987,6 +987,9 @@
+ GenericTree *node = music_tree_list->getCurrentNode();
+ Metadata *editMeta = gMusicData->all_music->getMetadata( node->getInt() );
+
++ if (!editMeta)
++ return;
++
+ EditMetadataDialog editDialog(editMeta, gContext->GetMainWindow(),
+ "edit_metadata", "music-", "edit metadata");
+ if (kDialogCodeRejected != editDialog.exec())
Index: mythplugins/mythmusic/mythmusic/miniplayer.cpp
===================================================================
--- mythplugins/mythmusic/mythmusic/miniplayer.cpp (revision 16468)
@@ -5200,6 +5214,10 @@
</message>
</context>
</TS>
+Index: mythplugins/mytharchive/i18n/mytharchive_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mytharchive/i18n/mytharchive_nl.ts
===================================================================
--- mythplugins/mytharchive/i18n/mytharchive_nl.ts (revision 16468)
@@ -6091,6 +6109,14 @@
<source>Parental Pin:</source>
<translation>Pincode:</translation>
</message>
+Index: mythplugins/mytharchive/i18n/mytharchive_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythplugins/mytharchive/i18n/mytharchive_dk.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mytharchive/mytharchive/archivemenu.xml
===================================================================
--- mythplugins/mytharchive/mytharchive/archivemenu.xml (revision 16468)
@@ -6623,6 +6649,10 @@
title = title[:32]
#Create the DVD ISO image
+Index: mythplugins/mythbrowser/i18n/mythbrowser_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythbrowser/i18n/mythbrowser_fi.ts
===================================================================
--- mythplugins/mythbrowser/i18n/mythbrowser_fi.ts (revision 16468)
@@ -6636,6 +6666,10 @@
</message>
</context>
</TS>
+Index: mythplugins/mythbrowser/i18n/mythbrowser_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythbrowser/i18n/mythbrowser_nl.ts
===================================================================
--- mythplugins/mythbrowser/i18n/mythbrowser_nl.ts (revision 16468)
@@ -8029,6 +8063,14 @@
</message>
</context>
</TS>
+Index: mythplugins/mythweather/i18n/mythweather_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythplugins/mythweather/i18n/mythweather_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl
===================================================================
--- mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl (revision 16468)
@@ -9344,6 +9386,10 @@
a multi-location screen you have to set the location of each individual data
item. This may not be ideal, but it does allow for very easy screen and
source development, along with very customizable location setups. The
+Index: mythplugins/mythgallery/i18n/mythgallery_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythgallery/i18n/mythgallery_nb.ts
===================================================================
--- mythplugins/mythgallery/i18n/mythgallery_nb.ts (revision 16468)
@@ -9739,6 +9785,10 @@
</message>
</context>
</TS>
+Index: mythplugins/mythgallery/i18n/mythgallery_nb.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythgallery/i18n/mythgallery_fi.ts
===================================================================
--- mythplugins/mythgallery/i18n/mythgallery_fi.ts (revision 16468)
@@ -9882,6 +9932,10 @@
</message>
</context>
<context>
+Index: mythplugins/mythgallery/i18n/mythgallery_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythmovies/ignyte/ignytegrabber.cpp
===================================================================
--- mythplugins/mythmovies/ignyte/ignytegrabber.cpp (revision 16468)
@@ -10131,6 +10185,10 @@
<source>Minutes</source>
<translation>Minuten</translation>
</message>
+Index: mythplugins/mythflix/i18n/mythflix_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythflix/i18n/mythflix_fi.ts
===================================================================
--- mythplugins/mythflix/i18n/mythflix_fi.ts (revision 16468)
@@ -10217,6 +10275,10 @@
</message>
</context>
<context>
+Index: mythplugins/mythflix/i18n/mythflix_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythflix/mythflix/netflix-ui.xml
===================================================================
--- mythplugins/mythflix/mythflix/netflix-ui.xml (revision 16468)
@@ -10239,7 +10301,21 @@
<position>0,0</position>
</image>
+Index: mythplugins/mythflix/mythflix/images/mythflix_background.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Property changes on: mythplugins/mythflix/mythflix/images/mythflix_background.png
+___________________________________________________________________
+Added: svn:mime-type
+ + application/octet-stream
+Added: svn:mergeinfo
+
+Index: mythplugins/mythflix/mythflix/images/news-info-bg.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.ts
===================================================================
--- mythplugins/mythcontrols/i18n/mythcontrols_nl.ts (revision 16468)
@@ -10528,6 +10604,10 @@
<source>No</source>
<translation type="obsolete">Nee</translation>
</message>
+Index: mythplugins/mythcontrols/i18n/mythcontrols_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythcontrols/i18n/mythcontrols_fi.ts
===================================================================
--- mythplugins/mythcontrols/i18n/mythcontrols_fi.ts (revision 16468)
@@ -10664,6 +10744,14 @@
</message>
</context>
<context>
+Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythplugins/mythvideo/i18n/mythvideo_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythvideo/i18n/mythvideo_nl.ts
===================================================================
--- mythplugins/mythvideo/i18n/mythvideo_nl.ts (revision 16468)
@@ -12214,6 +12302,21 @@
command_string = "Internal";
gContext->GetMainWindow()->HandleMedia(command_string, filename);
+Index: mythplugins/mythvideo/mythvideo/fileassoc.cpp
+===================================================================
+--- mythplugins/mythvideo/mythvideo/fileassoc.cpp (revision 16468)
++++ mythplugins/mythvideo/mythvideo/fileassoc.cpp (working copy)
+@@ -23,8 +23,8 @@
+
+ public:
+ FileAssociation(const QString &new_extension) :
+- id(-1), extension(new_extension), ignore(false), use_default(true),
+- changed(true), loaded_from_db(false) {}
++ id(-1), extension(new_extension), player_command(""), ignore(false),
++ use_default(true), changed(true), loaded_from_db(false) {}
+ FileAssociation(int i, const QString &e, const QString &p, bool g, bool u) :
+ id(i), extension(e), player_command(p), ignore(g), use_default(u),
+ changed(false), loaded_from_db(true) {}
Index: mythplugins/mythvideo/mythvideo/videofilter.cpp
===================================================================
--- mythplugins/mythvideo/mythvideo/videofilter.cpp (revision 16468)
@@ -12227,6 +12330,10 @@
}
else
{
+Index: mythplugins/mythphone/i18n/mythphone_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythphone/i18n/mythphone_nl.ts
===================================================================
--- mythplugins/mythphone/i18n/mythphone_nl.ts (revision 16468)
@@ -13004,6 +13111,10 @@
</message>
</context>
</TS>
+Index: mythplugins/mythgame/i18n/mythgame_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythgame/i18n/mythgame_nl.ts
===================================================================
--- mythplugins/mythgame/i18n/mythgame_nl.ts (revision 16468)
@@ -13433,6 +13544,10 @@
<source>Favorite:</source>
<translation>Favoriet:</translation>
</message>
+Index: mythplugins/mythgame/i18n/mythgame_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythgame/i18n/mythgame_fi.ts
===================================================================
--- mythplugins/mythgame/i18n/mythgame_fi.ts (revision 16468)
@@ -14586,6 +14701,14 @@
</message>
</context>
<context>
+Index: mythplugins/mythnews/i18n/mythnews_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythplugins/mythnews/i18n/mythnews_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythnews/i18n/mythnews_nl.ts
===================================================================
--- mythplugins/mythnews/i18n/mythnews_nl.ts (revision 16468)
mythtv-0.21-svnfixes.patch:
Index: mythtv-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-9/mythtv-0.21-svnfixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mythtv-0.21-svnfixes.patch 12 Dec 2008 03:49:51 -0000 1.4
+++ mythtv-0.21-svnfixes.patch 31 Dec 2008 00:19:04 -0000 1.5
@@ -26423,7 +26423,7 @@
Index: mythtv/libs/libs-targetfix.pro
===================================================================
--- mythtv/libs/libs-targetfix.pro (revision 0)
-+++ mythtv/libs/libs-targetfix.pro (revision 19344)
++++ mythtv/libs/libs-targetfix.pro (revision 19505)
@@ -0,0 +1,20 @@
+# Common project modifications to change the generated target.
+
@@ -27168,6 +27168,24 @@
if (!query.exec() || !query.isActive())
{
+Index: mythtv/libs/libmythtv/playgroup.cpp
+===================================================================
+--- mythtv/libs/libmythtv/playgroup.cpp (revision 16468)
++++ mythtv/libs/libmythtv/playgroup.cpp (working copy)
+@@ -114,7 +114,12 @@
+
+ virtual void save(void) {
+ if (intValue() < 50 || intValue() > 200)
+- setValue(0);
++ {
++ // We need to bypass the bounds checking that would
++ // normally occur in order to get the special value of 0
++ // into the database
++ IntegerSetting::setValue(0);
++ }
+ PlayGroupDBStorage::save();
+ }
+ };
Index: mythtv/libs/libmythtv/DVDRingBuffer.cpp
===================================================================
--- mythtv/libs/libmythtv/DVDRingBuffer.cpp (revision 16468)
@@ -28089,7 +28107,7 @@
Index: mythtv/libs/libmythtv/mpeg/freesat_huffman.h
===================================================================
--- mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 0)
-+++ mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 19344)
++++ mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 19505)
@@ -0,0 +1,12 @@
+#ifndef _FREESAT_HUFFMAN_H_
+#define _FREESAT_HUFFMAN_H_
@@ -28112,7 +28130,7 @@
Index: mythtv/libs/libmythtv/mpeg/freesat_tables.h
===================================================================
--- mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 0)
-+++ mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 19344)
++++ mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 19505)
@@ -0,0 +1,4370 @@
+struct fsattab fsat_table[] = {
+ { 0x00000000, 2, 'T'},
@@ -32493,7 +32511,7 @@
Index: mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp
===================================================================
--- mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp (revision 0)
-+++ mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp (revision 19344)
++++ mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp (revision 19505)
@@ -0,0 +1,107 @@
+#include "freesat_huffman.h"
+
@@ -32612,8 +32630,12 @@
===================================================================
--- mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp (revision 16468)
+++ mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp (working copy)
-@@ -926,10 +926,11 @@
- int MPEGStreamData::ProcessData(unsigned char *buffer, int len)
+@@ -923,15 +923,16 @@
+ }
+ #undef DONE_WITH_PES_PACKET
+
+-int MPEGStreamData::ProcessData(unsigned char *buffer, int len)
++int MPEGStreamData::ProcessData(const unsigned char *buffer, int len)
{
int pos = 0;
+ bool resync = false;
@@ -32623,8 +32645,11 @@
- if (buffer[pos] != SYNC_BYTE)
+ if (buffer[pos] != SYNC_BYTE || resync)
{
- int newpos = ResyncStream(buffer, pos, len);
+- int newpos = ResyncStream(buffer, pos, len);
++ int newpos = ResyncStream(buffer, pos+1, len);
if (newpos == -1)
+ return len - pos;
+ if (newpos == -2)
@@ -942,9 +943,12 @@
const TSPacket *pkt = reinterpret_cast<const TSPacket*>(&buffer[pos]);
@@ -32639,6 +32664,16 @@
}
return len - pos;
+@@ -995,7 +999,8 @@
+ return true;
+ }
+
+-int MPEGStreamData::ResyncStream(unsigned char *buffer, int curr_pos, int len)
++int MPEGStreamData::ResyncStream(const unsigned char *buffer, int curr_pos,
++ int len)
+ {
+ // Search for two sync bytes 188 bytes apart,
+ int pos = curr_pos;
Index: mythtv/libs/libmythtv/mpeg/pespacket.cpp
===================================================================
--- mythtv/libs/libmythtv/mpeg/pespacket.cpp (revision 16468)
@@ -32723,6 +32758,28 @@
}
return add_pids.size() || del_pids.size();
+Index: mythtv/libs/libmythtv/mpeg/mpegstreamdata.h
+===================================================================
+--- mythtv/libs/libmythtv/mpeg/mpegstreamdata.h (revision 16468)
++++ mythtv/libs/libmythtv/mpeg/mpegstreamdata.h (working copy)
+@@ -107,7 +107,7 @@
+ virtual bool HandleTables(uint pid, const PSIPTable &psip);
+ virtual void HandleTSTables(const TSPacket* tspacket);
+ virtual bool ProcessTSPacket(const TSPacket& tspacket);
+- virtual int ProcessData(unsigned char *buffer, int len);
++ virtual int ProcessData(const unsigned char *buffer, int len);
+ inline void HandleAdaptationFieldControl(const TSPacket* tspacket);
+
+ // Listening
+@@ -293,7 +293,7 @@
+ void ProcessPMT(const ProgramMapTable *pmt);
+ void ProcessEncryptedPacket(const TSPacket&);
+
+- static int ResyncStream(unsigned char *buffer, int curr_pos, int len);
++ static int ResyncStream(const unsigned char *buffer, int curr_pos, int len);
+
+ void UpdateTimeOffset(uint64_t si_utc_time);
+
Index: mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp
===================================================================
--- mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp (revision 16468)
@@ -33957,7 +34014,7 @@
Index: mythtv/libs/libavcodec/rectangle.h
===================================================================
--- mythtv/libs/libavcodec/rectangle.h (revision 0)
-+++ mythtv/libs/libavcodec/rectangle.h (revision 19344)
++++ mythtv/libs/libavcodec/rectangle.h (revision 19505)
@@ -0,0 +1,121 @@
+/*
+ * rectangle filling function
@@ -34182,7 +34239,7 @@
Index: mythtv/libs/libavcodec/i386/h264_i386.h
===================================================================
--- mythtv/libs/libavcodec/i386/h264_i386.h (revision 0)
-+++ mythtv/libs/libavcodec/i386/h264_i386.h (revision 19344)
++++ mythtv/libs/libavcodec/i386/h264_i386.h (revision 19505)
@@ -0,0 +1,144 @@
+/*
+ * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
@@ -43849,7 +43906,7 @@
Index: mythtv/contrib/Win32/build/mythtvsetup.iss
===================================================================
--- mythtv/contrib/Win32/build/mythtvsetup.iss (revision 0)
-+++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19344)
++++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19505)
@@ -0,0 +1,493 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
@@ -44353,7 +44410,7 @@
Index: mythtv/contrib/Win32/MythInstaller.bat
===================================================================
--- mythtv/contrib/Win32/MythInstaller.bat (revision 0)
-+++ mythtv/contrib/Win32/MythInstaller.bat (revision 19344)
++++ mythtv/contrib/Win32/MythInstaller.bat (revision 19505)
@@ -0,0 +1,69 @@
+@rem = '--*-Perl-*--
+@rem
@@ -44435,7 +44492,7 @@
Index: mythtv/contrib/Win32/run/mythfrontend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19344)
++++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19505)
@@ -0,0 +1,57 @@
+@Echo off
+::
@@ -44497,7 +44554,7 @@
Index: mythtv/contrib/Win32/run/mythbackend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19344)
++++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19505)
@@ -0,0 +1,58 @@
+@Echo off
+::
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-9/mythtv.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mythtv.spec 12 Dec 2008 05:05:53 -0000 1.8
+++ mythtv.spec 31 Dec 2008 00:19:04 -0000 1.9
@@ -1,5 +1,5 @@
# svn revision number
-%define _svnver r19344
+%define _svnver r19505
%define branch release-0-21-fixes
# Nb: base 0.21 svn rev is r16468
#define branch trunk
@@ -22,7 +22,7 @@
%if "%{branch}" == "trunk"
Release: 0.2.%{_svnver}%{?dist}
%else
-Release: 15%{?dist}
+Release: 16%{?dist}
%endif
URL: http://www.mythtv.org/
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1023,6 +1023,10 @@
%endif
%changelog
+* Tue Dec 30 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-16
+- Update release-0-21-fixes patches (r19505)
+- Fixes infinite loop introduced by firewire fix in -15 (rpmfusion bz#286)
+
* Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-15
- Update to release-0-21-fixes patches (r19344)
- Includes critical fix for supporting use of FireWire cable
15 years, 3 months
- 1
- 0
rpms/mythtv/F-10 mythplugins-0.21-svnfixes.patch, 1.5, 1.6 mythtv-0.21-svnfixes.patch, 1.5, 1.6 mythtv.spec, 1.15, 1.16
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28574
Modified Files:
mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch
mythtv.spec
Log Message:
* Tue Dec 30 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-16
- Update release-0-21-fixes patches (r19505)
- Fixes infinite loop introduced by firewire fix in -15 (rpmfusion bz#286)
mythplugins-0.21-svnfixes.patch:
Index: mythplugins-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-10/mythplugins-0.21-svnfixes.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mythplugins-0.21-svnfixes.patch 12 Dec 2008 03:48:37 -0000 1.5
+++ mythplugins-0.21-svnfixes.patch 31 Dec 2008 00:15:22 -0000 1.6
@@ -3978,6 +3978,20 @@
</message>
</context>
</TS>
+Index: mythplugins/mythmusic/mythmusic/playbackbox.cpp
+===================================================================
+--- mythplugins/mythmusic/mythmusic/playbackbox.cpp (revision 16468)
++++ mythplugins/mythmusic/mythmusic/playbackbox.cpp (working copy)
+@@ -987,6 +987,9 @@
+ GenericTree *node = music_tree_list->getCurrentNode();
+ Metadata *editMeta = gMusicData->all_music->getMetadata( node->getInt() );
+
++ if (!editMeta)
++ return;
++
+ EditMetadataDialog editDialog(editMeta, gContext->GetMainWindow(),
+ "edit_metadata", "music-", "edit metadata");
+ if (kDialogCodeRejected != editDialog.exec())
Index: mythplugins/mythmusic/mythmusic/miniplayer.cpp
===================================================================
--- mythplugins/mythmusic/mythmusic/miniplayer.cpp (revision 16468)
@@ -5200,6 +5214,10 @@
</message>
</context>
</TS>
+Index: mythplugins/mytharchive/i18n/mytharchive_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mytharchive/i18n/mytharchive_nl.ts
===================================================================
--- mythplugins/mytharchive/i18n/mytharchive_nl.ts (revision 16468)
@@ -6091,6 +6109,14 @@
<source>Parental Pin:</source>
<translation>Pincode:</translation>
</message>
+Index: mythplugins/mytharchive/i18n/mytharchive_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythplugins/mytharchive/i18n/mytharchive_dk.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mytharchive/mytharchive/archivemenu.xml
===================================================================
--- mythplugins/mytharchive/mytharchive/archivemenu.xml (revision 16468)
@@ -6623,6 +6649,10 @@
title = title[:32]
#Create the DVD ISO image
+Index: mythplugins/mythbrowser/i18n/mythbrowser_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythbrowser/i18n/mythbrowser_fi.ts
===================================================================
--- mythplugins/mythbrowser/i18n/mythbrowser_fi.ts (revision 16468)
@@ -6636,6 +6666,10 @@
</message>
</context>
</TS>
+Index: mythplugins/mythbrowser/i18n/mythbrowser_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythbrowser/i18n/mythbrowser_nl.ts
===================================================================
--- mythplugins/mythbrowser/i18n/mythbrowser_nl.ts (revision 16468)
@@ -8029,6 +8063,14 @@
</message>
</context>
</TS>
+Index: mythplugins/mythweather/i18n/mythweather_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythplugins/mythweather/i18n/mythweather_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl
===================================================================
--- mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl (revision 16468)
@@ -9344,6 +9386,10 @@
a multi-location screen you have to set the location of each individual data
item. This may not be ideal, but it does allow for very easy screen and
source development, along with very customizable location setups. The
+Index: mythplugins/mythgallery/i18n/mythgallery_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythgallery/i18n/mythgallery_nb.ts
===================================================================
--- mythplugins/mythgallery/i18n/mythgallery_nb.ts (revision 16468)
@@ -9739,6 +9785,10 @@
</message>
</context>
</TS>
+Index: mythplugins/mythgallery/i18n/mythgallery_nb.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythgallery/i18n/mythgallery_fi.ts
===================================================================
--- mythplugins/mythgallery/i18n/mythgallery_fi.ts (revision 16468)
@@ -9882,6 +9932,10 @@
</message>
</context>
<context>
+Index: mythplugins/mythgallery/i18n/mythgallery_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythmovies/ignyte/ignytegrabber.cpp
===================================================================
--- mythplugins/mythmovies/ignyte/ignytegrabber.cpp (revision 16468)
@@ -10131,6 +10185,10 @@
<source>Minutes</source>
<translation>Minuten</translation>
</message>
+Index: mythplugins/mythflix/i18n/mythflix_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythflix/i18n/mythflix_fi.ts
===================================================================
--- mythplugins/mythflix/i18n/mythflix_fi.ts (revision 16468)
@@ -10217,6 +10275,10 @@
</message>
</context>
<context>
+Index: mythplugins/mythflix/i18n/mythflix_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythflix/mythflix/netflix-ui.xml
===================================================================
--- mythplugins/mythflix/mythflix/netflix-ui.xml (revision 16468)
@@ -10239,7 +10301,21 @@
<position>0,0</position>
</image>
+Index: mythplugins/mythflix/mythflix/images/mythflix_background.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Property changes on: mythplugins/mythflix/mythflix/images/mythflix_background.png
+___________________________________________________________________
+Added: svn:mime-type
+ + application/octet-stream
+Added: svn:mergeinfo
+
+Index: mythplugins/mythflix/mythflix/images/news-info-bg.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.ts
===================================================================
--- mythplugins/mythcontrols/i18n/mythcontrols_nl.ts (revision 16468)
@@ -10528,6 +10604,10 @@
<source>No</source>
<translation type="obsolete">Nee</translation>
</message>
+Index: mythplugins/mythcontrols/i18n/mythcontrols_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythcontrols/i18n/mythcontrols_fi.ts
===================================================================
--- mythplugins/mythcontrols/i18n/mythcontrols_fi.ts (revision 16468)
@@ -10664,6 +10744,14 @@
</message>
</context>
<context>
+Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythplugins/mythvideo/i18n/mythvideo_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythvideo/i18n/mythvideo_nl.ts
===================================================================
--- mythplugins/mythvideo/i18n/mythvideo_nl.ts (revision 16468)
@@ -12214,6 +12302,21 @@
command_string = "Internal";
gContext->GetMainWindow()->HandleMedia(command_string, filename);
+Index: mythplugins/mythvideo/mythvideo/fileassoc.cpp
+===================================================================
+--- mythplugins/mythvideo/mythvideo/fileassoc.cpp (revision 16468)
++++ mythplugins/mythvideo/mythvideo/fileassoc.cpp (working copy)
+@@ -23,8 +23,8 @@
+
+ public:
+ FileAssociation(const QString &new_extension) :
+- id(-1), extension(new_extension), ignore(false), use_default(true),
+- changed(true), loaded_from_db(false) {}
++ id(-1), extension(new_extension), player_command(""), ignore(false),
++ use_default(true), changed(true), loaded_from_db(false) {}
+ FileAssociation(int i, const QString &e, const QString &p, bool g, bool u) :
+ id(i), extension(e), player_command(p), ignore(g), use_default(u),
+ changed(false), loaded_from_db(true) {}
Index: mythplugins/mythvideo/mythvideo/videofilter.cpp
===================================================================
--- mythplugins/mythvideo/mythvideo/videofilter.cpp (revision 16468)
@@ -12227,6 +12330,10 @@
}
else
{
+Index: mythplugins/mythphone/i18n/mythphone_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythphone/i18n/mythphone_nl.ts
===================================================================
--- mythplugins/mythphone/i18n/mythphone_nl.ts (revision 16468)
@@ -13004,6 +13111,10 @@
</message>
</context>
</TS>
+Index: mythplugins/mythgame/i18n/mythgame_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythgame/i18n/mythgame_nl.ts
===================================================================
--- mythplugins/mythgame/i18n/mythgame_nl.ts (revision 16468)
@@ -13433,6 +13544,10 @@
<source>Favorite:</source>
<translation>Favoriet:</translation>
</message>
+Index: mythplugins/mythgame/i18n/mythgame_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythgame/i18n/mythgame_fi.ts
===================================================================
--- mythplugins/mythgame/i18n/mythgame_fi.ts (revision 16468)
@@ -14586,6 +14701,14 @@
</message>
</context>
<context>
+Index: mythplugins/mythnews/i18n/mythnews_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythplugins/mythnews/i18n/mythnews_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: mythplugins/mythnews/i18n/mythnews_nl.ts
===================================================================
--- mythplugins/mythnews/i18n/mythnews_nl.ts (revision 16468)
mythtv-0.21-svnfixes.patch:
Index: mythtv-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-10/mythtv-0.21-svnfixes.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mythtv-0.21-svnfixes.patch 12 Dec 2008 03:48:38 -0000 1.5
+++ mythtv-0.21-svnfixes.patch 31 Dec 2008 00:15:22 -0000 1.6
@@ -26423,7 +26423,7 @@
Index: mythtv/libs/libs-targetfix.pro
===================================================================
--- mythtv/libs/libs-targetfix.pro (revision 0)
-+++ mythtv/libs/libs-targetfix.pro (revision 19344)
++++ mythtv/libs/libs-targetfix.pro (revision 19505)
@@ -0,0 +1,20 @@
+# Common project modifications to change the generated target.
+
@@ -27168,6 +27168,24 @@
if (!query.exec() || !query.isActive())
{
+Index: mythtv/libs/libmythtv/playgroup.cpp
+===================================================================
+--- mythtv/libs/libmythtv/playgroup.cpp (revision 16468)
++++ mythtv/libs/libmythtv/playgroup.cpp (working copy)
+@@ -114,7 +114,12 @@
+
+ virtual void save(void) {
+ if (intValue() < 50 || intValue() > 200)
+- setValue(0);
++ {
++ // We need to bypass the bounds checking that would
++ // normally occur in order to get the special value of 0
++ // into the database
++ IntegerSetting::setValue(0);
++ }
+ PlayGroupDBStorage::save();
+ }
+ };
Index: mythtv/libs/libmythtv/DVDRingBuffer.cpp
===================================================================
--- mythtv/libs/libmythtv/DVDRingBuffer.cpp (revision 16468)
@@ -28089,7 +28107,7 @@
Index: mythtv/libs/libmythtv/mpeg/freesat_huffman.h
===================================================================
--- mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 0)
-+++ mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 19344)
++++ mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 19505)
@@ -0,0 +1,12 @@
+#ifndef _FREESAT_HUFFMAN_H_
+#define _FREESAT_HUFFMAN_H_
@@ -28112,7 +28130,7 @@
Index: mythtv/libs/libmythtv/mpeg/freesat_tables.h
===================================================================
--- mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 0)
-+++ mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 19344)
++++ mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 19505)
@@ -0,0 +1,4370 @@
+struct fsattab fsat_table[] = {
+ { 0x00000000, 2, 'T'},
@@ -32493,7 +32511,7 @@
Index: mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp
===================================================================
--- mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp (revision 0)
-+++ mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp (revision 19344)
++++ mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp (revision 19505)
@@ -0,0 +1,107 @@
+#include "freesat_huffman.h"
+
@@ -32612,8 +32630,12 @@
===================================================================
--- mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp (revision 16468)
+++ mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp (working copy)
-@@ -926,10 +926,11 @@
- int MPEGStreamData::ProcessData(unsigned char *buffer, int len)
+@@ -923,15 +923,16 @@
+ }
+ #undef DONE_WITH_PES_PACKET
+
+-int MPEGStreamData::ProcessData(unsigned char *buffer, int len)
++int MPEGStreamData::ProcessData(const unsigned char *buffer, int len)
{
int pos = 0;
+ bool resync = false;
@@ -32623,8 +32645,11 @@
- if (buffer[pos] != SYNC_BYTE)
+ if (buffer[pos] != SYNC_BYTE || resync)
{
- int newpos = ResyncStream(buffer, pos, len);
+- int newpos = ResyncStream(buffer, pos, len);
++ int newpos = ResyncStream(buffer, pos+1, len);
if (newpos == -1)
+ return len - pos;
+ if (newpos == -2)
@@ -942,9 +943,12 @@
const TSPacket *pkt = reinterpret_cast<const TSPacket*>(&buffer[pos]);
@@ -32639,6 +32664,16 @@
}
return len - pos;
+@@ -995,7 +999,8 @@
+ return true;
+ }
+
+-int MPEGStreamData::ResyncStream(unsigned char *buffer, int curr_pos, int len)
++int MPEGStreamData::ResyncStream(const unsigned char *buffer, int curr_pos,
++ int len)
+ {
+ // Search for two sync bytes 188 bytes apart,
+ int pos = curr_pos;
Index: mythtv/libs/libmythtv/mpeg/pespacket.cpp
===================================================================
--- mythtv/libs/libmythtv/mpeg/pespacket.cpp (revision 16468)
@@ -32723,6 +32758,28 @@
}
return add_pids.size() || del_pids.size();
+Index: mythtv/libs/libmythtv/mpeg/mpegstreamdata.h
+===================================================================
+--- mythtv/libs/libmythtv/mpeg/mpegstreamdata.h (revision 16468)
++++ mythtv/libs/libmythtv/mpeg/mpegstreamdata.h (working copy)
+@@ -107,7 +107,7 @@
+ virtual bool HandleTables(uint pid, const PSIPTable &psip);
+ virtual void HandleTSTables(const TSPacket* tspacket);
+ virtual bool ProcessTSPacket(const TSPacket& tspacket);
+- virtual int ProcessData(unsigned char *buffer, int len);
++ virtual int ProcessData(const unsigned char *buffer, int len);
+ inline void HandleAdaptationFieldControl(const TSPacket* tspacket);
+
+ // Listening
+@@ -293,7 +293,7 @@
+ void ProcessPMT(const ProgramMapTable *pmt);
+ void ProcessEncryptedPacket(const TSPacket&);
+
+- static int ResyncStream(unsigned char *buffer, int curr_pos, int len);
++ static int ResyncStream(const unsigned char *buffer, int curr_pos, int len);
+
+ void UpdateTimeOffset(uint64_t si_utc_time);
+
Index: mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp
===================================================================
--- mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp (revision 16468)
@@ -33957,7 +34014,7 @@
Index: mythtv/libs/libavcodec/rectangle.h
===================================================================
--- mythtv/libs/libavcodec/rectangle.h (revision 0)
-+++ mythtv/libs/libavcodec/rectangle.h (revision 19344)
++++ mythtv/libs/libavcodec/rectangle.h (revision 19505)
@@ -0,0 +1,121 @@
+/*
+ * rectangle filling function
@@ -34182,7 +34239,7 @@
Index: mythtv/libs/libavcodec/i386/h264_i386.h
===================================================================
--- mythtv/libs/libavcodec/i386/h264_i386.h (revision 0)
-+++ mythtv/libs/libavcodec/i386/h264_i386.h (revision 19344)
++++ mythtv/libs/libavcodec/i386/h264_i386.h (revision 19505)
@@ -0,0 +1,144 @@
+/*
+ * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
@@ -43849,7 +43906,7 @@
Index: mythtv/contrib/Win32/build/mythtvsetup.iss
===================================================================
--- mythtv/contrib/Win32/build/mythtvsetup.iss (revision 0)
-+++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19344)
++++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19505)
@@ -0,0 +1,493 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
@@ -44353,7 +44410,7 @@
Index: mythtv/contrib/Win32/MythInstaller.bat
===================================================================
--- mythtv/contrib/Win32/MythInstaller.bat (revision 0)
-+++ mythtv/contrib/Win32/MythInstaller.bat (revision 19344)
++++ mythtv/contrib/Win32/MythInstaller.bat (revision 19505)
@@ -0,0 +1,69 @@
+@rem = '--*-Perl-*--
+@rem
@@ -44435,7 +44492,7 @@
Index: mythtv/contrib/Win32/run/mythfrontend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19344)
++++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19505)
@@ -0,0 +1,57 @@
+@Echo off
+::
@@ -44497,7 +44554,7 @@
Index: mythtv/contrib/Win32/run/mythbackend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19344)
++++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19505)
@@ -0,0 +1,58 @@
+@Echo off
+::
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-10/mythtv.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mythtv.spec 12 Dec 2008 04:55:42 -0000 1.15
+++ mythtv.spec 31 Dec 2008 00:15:22 -0000 1.16
@@ -1,5 +1,5 @@
# svn revision number
-%define _svnver r19344
+%define _svnver r19505
%define branch release-0-21-fixes
# Nb: base 0.21 svn rev is r16468
#define branch trunk
@@ -22,7 +22,7 @@
%if "%{branch}" == "trunk"
Release: 0.2.%{_svnver}%{?dist}
%else
-Release: 15%{?dist}
+Release: 16%{?dist}
%endif
URL: http://www.mythtv.org/
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1023,6 +1023,10 @@
%endif
%changelog
+* Tue Dec 30 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-16
+- Update release-0-21-fixes patches (r19505)
+- Fixes infinite loop introduced by firewire fix in -15 (rpmfusion bz#286)
+
* Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-15
- Update to release-0-21-fixes patches (r19344)
- Includes critical fix for supporting use of FireWire cable
15 years, 3 months
- 1
- 0
rpms/xorg-x11-drv-fglrx/F-10 xorg-x11-drv-fglrx.spec,1.13,1.14
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25000/F-10
Modified Files:
xorg-x11-drv-fglrx.spec
Log Message:
* Tue Dec 30 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-5.8.12
- Only create symlink for dri workaround on x86_64
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-fglrx.spec 30 Dec 2008 22:41:04 -0000 1.13
+++ xorg-x11-drv-fglrx.spec 30 Dec 2008 23:11:13 -0000 1.14
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-fglrx
Version: 8.561
-Release: 4.%{ativersion}%{?dist}
+Release: 5.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: BSD/Commercial/GPL/QPL
@@ -238,9 +238,11 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d
install -pm 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/40-fglrx-dri.nodes
+%ifarch x86_64
# dri workaround
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/dri
ln -s ../lib64/fglrx_dri.so $RPM_BUILD_ROOT%{_prefix}/lib/dri/
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -321,6 +323,9 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Tue Dec 30 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-5.8.12
+- Only create symlink for dri workaround on x86_64
+
* Sun Dec 28 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-4.8.12
- Move fglrx_dri.so to monolib package
- Static blacklist required for <R600 hardware, add it back
15 years, 3 months
- 1
- 0
rpms/xorg-x11-drv-fglrx/F-9 xorg-x11-drv-fglrx.spec,1.11,1.12
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25000/F-9
Modified Files:
xorg-x11-drv-fglrx.spec
Log Message:
* Tue Dec 30 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-5.8.12
- Only create symlink for dri workaround on x86_64
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-fglrx.spec 30 Dec 2008 22:41:05 -0000 1.11
+++ xorg-x11-drv-fglrx.spec 30 Dec 2008 23:11:13 -0000 1.12
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-fglrx
Version: 8.561
-Release: 3.%{ativersion}%{?dist}
+Release: 4.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: BSD/Commercial/GPL/QPL
@@ -227,9 +227,11 @@
chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.xbm.example
chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.sh
+%ifarch x86_64
# dri workaround
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/dri
ln -s ../lib64/fglrx_dri.so $RPM_BUILD_ROOT%{_prefix}/lib/dri/
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -308,6 +310,9 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Tue Dec 30 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-4.8.12
+- Only create symlink for dri workaround on x86_64
+
* Sun Dec 28 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-3.8.12
- Move fglrx_dri.so to monolib package
- Make fglrx-config-display check the ldfile to see if it's already enabled
15 years, 3 months
- 1
- 0
rpms/fglrx-kmod/F-10 fglrx-kmod.spec,1.20,1.21
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23708
Modified Files:
fglrx-kmod.spec
Log Message:
Build for newest only
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-10/fglrx-kmod.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- fglrx-kmod.spec 28 Dec 2008 16:16:01 -0000 1.20
+++ fglrx-kmod.spec 30 Dec 2008 22:47:13 -0000 1.21
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
%define ativersion 8.12
15 years, 3 months
- 1
- 0
rpms/xorg-x11-drv-fglrx/F-10 blacklist-radeon, NONE, 1.1 fglrx-README.Fedora, 1.1, 1.2 fglrx-config-display, 1.2, 1.3 xorg-x11-drv-fglrx.spec, 1.12, 1.13
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23030/F-10
Modified Files:
fglrx-README.Fedora fglrx-config-display
xorg-x11-drv-fglrx.spec
Added Files:
blacklist-radeon
Log Message:
* Sun Dec 28 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-4.8.12
- Move fglrx_dri.so to monolib package
- Static blacklist required for <R600 hardware, add it back
- Make fglrx-config-display check the ldfile to see if it's already enabled
--- NEW FILE blacklist-radeon ---
#blacklist required for proprietary fglrx driver
blacklist radeon
blacklist radeonfb
blacklist drm
Index: fglrx-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/fglrx-README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fglrx-README.Fedora 16 Oct 2008 16:20:01 -0000 1.1
+++ fglrx-README.Fedora 30 Dec 2008 22:41:04 -0000 1.2
@@ -1,7 +1,8 @@
-README for AMD's Linux fglrx drivers, as packaged by livna.org.
+README for AMD's Linux fglrx drivers, as packaged by rpmfusion.org.
+
1. After Installation
----------------------
+-----------------------------
The easiest way to start using the fglrx drivers after installation is to
restart your system.
@@ -44,8 +45,9 @@
fglrx-config-display disable
Note: DRI will be disabled in this case when the fglrx kernel-module was
loaded. It will be enabled again on the next system restart.
-To re-enable the fglrx drivers, run:
- fglrx-config-display enable
+To re-enable the fglrx drivers without a reboot, run:
+ fglrx-config-display enable
+
3. Additional configuration
@@ -54,14 +56,33 @@
For configuration options (TwinView, TV-out etc) see
/usr/share/doc/fglrx-*/index.html
+
4. Kernel Module
-----------------------
+-----------------------------
+
+The fglrx kernel module is required for DRI. For Fedora kernels you will find
+RPMs with the name:
+ kmod-fglrx-$(uname -r)-(ati-version)-fc(releasever).(arch).rpm
+ (e.g. kmod-fglrx-2.6.27.7-134.fc10.x86_64-8.561-1.8.12.fc10.x86_64)
+at rpmfusion.org. If you use another kernel, grab the proper SRPM:
+ (e.g fglrx-kmod-8.561-2.8.12.fc10.src.rpm)
+from rpmfusion.org and rebuild the kernel module with the following command:
+ rpmbuild --rebuild /path/to/fglrx-srpm.src.rpm
+
+
+5. Release-specific notes
+-----------------------------
+
+This release (Catalyst 8.12) is incompatible with the plymouth graphical boot
+system implemented in Fedora 10, as the 'radeon' and 'drm' kernel modules are
+loaded from the kernel ramdisk image (initrd) before fglrx can be. Because of
+this, these modules have been blacklisted. The open-source radeon driver as well
+as the plymouth graphical boot system will not function while the this driver is
+installed. If you would like to use them, please uninstall this driver first.
+
+The initrd image for the current kernel will need to be regenerated before 3D
+rendering will function correctly. To do this, execute these commands as root:
+ mv /boot/initrd-`uname -r`.img /boot/initrd-`uname -r`.img.bak
+ mkinitrd -f --allow-missing /boot/`uname -r`.img
-The fglrx kernel module is required for DRI. For Fedora kernels you will
-find RPMs with the name:
- kmod-fglrx-$(uname -r)-(ati-version)-(livna-release-tag).(arch).rpm
- (e.g. kmod-fglrx-8.34.8-1.2.6.20_1.2933.fc6.i686.rpm)
-at rpm.livna.org. If you use another kernel grab the proper SRPM
- (e.g fglrx-kmod-8.34.8-4.2.6.20_1.2962.fc7.src.rpm)
-from rpm.livna.org and rebuild the kernel module with the following command:
- rpmbuild --rebuild /path/to/fglrxRPM.src.rpm
+A final reboot will be required before things function as expected.
Index: fglrx-config-display
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/fglrx-config-display,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fglrx-config-display 26 Dec 2008 03:39:46 -0000 1.2
+++ fglrx-config-display 30 Dec 2008 22:41:04 -0000 1.3
@@ -55,7 +55,7 @@
# Backup the file before make any change.
currentDriver = self.getDriver()
# Already enabled?
- if currentDriver == self.majorVendor:
+ if os.path.exists(self.ldconf):
print _('Driver already enabled.')
return
@@ -101,20 +101,13 @@
Utils.writeFile(self.ldconf,"/usr/lib/fglrx\n")
print _('Running ldconfig, this could take some time...')
Utils.runLdconfig()
- # Requires for F10
- blacklistContent = "#blacklist required for proprietary fglrx driver\nblacklist radeon\nblacklist radeonfb\nblacklist drm\n"
- Utils.writeFile('/etc/modprobe.d/blacklist-radeon', blacklistContent)
- print _('Please reboot to finish driver configuration.')
- # Haven't heard of this in a while either.
- #if not self.checkForModuleAndRemove("radeon") or not self.checkForModuleAndRemove("drm"):
- # print WARNING_DRI_NOT_AVAILABLE
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
self.restoreconf()
def disable(self, isAutoConfigure=True):
self.removeModulePath("/extensions/fglrx", self.TOP_MOD_DIR)
# Check if it's already disabled
- if self.getDriver() != self.majorVendor:
+ if not os.path.exists(self.ldconf):
print _('Driver already disabled.')
return
# We have to save the status file so it can be restored later
@@ -133,7 +126,6 @@
Utils.removeFile(self.ldconf)
print _('Running ldconfig, this could take some time...')
Utils.runLdconfig()
- Utils.removeFile('/etc/modprobe.d/blacklist-radeon')
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
# And return to the Fedora default.
self.enableAiglx()
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-fglrx.spec 26 Dec 2008 03:41:58 -0000 1.12
+++ xorg-x11-drv-fglrx.spec 30 Dec 2008 22:41:04 -0000 1.13
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-fglrx
Version: 8.561
-Release: 3.%{ativersion}%{?dist}
+Release: 4.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: BSD/Commercial/GPL/QPL
@@ -26,6 +26,7 @@
Source10: fglrx.sh
Source11: fglrx.csh
Source12: udev-fglrx
+Source13: blacklist-radeon
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -229,10 +230,18 @@
chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.xbm.example
chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.sh
-#Udev dri nodes for fglrx
+# blacklist to prevent radeon autoloading
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
+install -pm 0644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/blacklist-radeon
+
+# Udev dri nodes for fglrx
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d
install -pm 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/40-fglrx-dri.nodes
+# dri workaround
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/dri
+ln -s ../lib64/fglrx_dri.so $RPM_BUILD_ROOT%{_prefix}/lib/dri/
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -276,7 +285,8 @@
%config %{_sysconfdir}/ati/control
%config %{_sysconfdir}/ati/amdpcsdb.default
%config(noreplace) %{_sysconfdir}/acpi/events/*aticonfig.conf
-%config(noreplace)%{_sysconfdir}/profile.d/fglrx.*
+%config(noreplace) %{_sysconfdir}/profile.d/fglrx.*
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-radeon
%{_initrddir}/*
%{_sbindir}/*
%{_bindir}/*
@@ -290,6 +300,10 @@
%{_mandir}/man[1-9]/atieventsd.*
%{_libdir}/xorg/modules/extensions/fglrx/
%{_libdir}/xorg/modules/*.so
+%{_libdir}/dri/
+%ifarch x86_64
+%{_prefix}/lib/dri/
+%endif
%files libs
%defattr(-,root,root,-)
@@ -297,7 +311,6 @@
%{atilibdir}/*.so*
# FIXME: This file is recognized as "data" - figure out how to move it later
%{atilibdir}/libAMDXvBA.cap
-%{_libdir}/dri/
%files devel
%defattr(-,root,root,-)
@@ -308,6 +321,11 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Sun Dec 28 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-4.8.12
+- Move fglrx_dri.so to monolib package
+- Static blacklist required for <R600 hardware, add it back
+- Make fglrx-config-display check the ldfile to see if it's already enabled
+
* Thu Dec 25 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-3.8.12
- Remove blacklist, generate via fglrx-config-display instead
- Add extra bits to create Screen section in xorg.conf
15 years, 3 months
- 1
- 0
rpms/xorg-x11-drv-fglrx/F-9 fglrx-README.Fedora, 1.1, 1.2 fglrx-config-display, 1.2, 1.3 xorg-x11-drv-fglrx.spec, 1.10, 1.11
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23030/F-9
Modified Files:
fglrx-README.Fedora fglrx-config-display
xorg-x11-drv-fglrx.spec
Log Message:
* Sun Dec 28 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-4.8.12
- Move fglrx_dri.so to monolib package
- Static blacklist required for <R600 hardware, add it back
- Make fglrx-config-display check the ldfile to see if it's already enabled
Index: fglrx-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/fglrx-README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fglrx-README.Fedora 16 Oct 2008 16:20:01 -0000 1.1
+++ fglrx-README.Fedora 30 Dec 2008 22:41:05 -0000 1.2
@@ -1,7 +1,8 @@
-README for AMD's Linux fglrx drivers, as packaged by livna.org.
+README for AMD's Linux fglrx drivers, as packaged by rpmfusion.org.
+
1. After Installation
----------------------
+-----------------------------
The easiest way to start using the fglrx drivers after installation is to
restart your system.
@@ -44,8 +45,9 @@
fglrx-config-display disable
Note: DRI will be disabled in this case when the fglrx kernel-module was
loaded. It will be enabled again on the next system restart.
-To re-enable the fglrx drivers, run:
- fglrx-config-display enable
+To re-enable the fglrx drivers without a reboot, run:
+ fglrx-config-display enable
+
3. Additional configuration
@@ -54,14 +56,16 @@
For configuration options (TwinView, TV-out etc) see
/usr/share/doc/fglrx-*/index.html
+
4. Kernel Module
-----------------------
+-----------------------------
+
+The fglrx kernel module is required for DRI. For Fedora kernels you will find
+RPMs with the name:
+ kmod-fglrx-$(uname -r)-(ati-version)-fc(releasever).(arch).rpm
+ (e.g. kmod-fglrx-2.6.27.7-134.fc10.x86_64-8.561-1.8.12.fc10.x86_64)
+at rpmfusion.org. If you use another kernel, grab the proper SRPM:
+ (e.g fglrx-kmod-8.561-2.8.12.fc10.src.rpm)
+from rpmfusion.org and rebuild the kernel module with the following command:
+ rpmbuild --rebuild /path/to/fglrx-srpm.src.rpm
-The fglrx kernel module is required for DRI. For Fedora kernels you will
-find RPMs with the name:
- kmod-fglrx-$(uname -r)-(ati-version)-(livna-release-tag).(arch).rpm
- (e.g. kmod-fglrx-8.34.8-1.2.6.20_1.2933.fc6.i686.rpm)
-at rpm.livna.org. If you use another kernel grab the proper SRPM
- (e.g fglrx-kmod-8.34.8-4.2.6.20_1.2962.fc7.src.rpm)
-from rpm.livna.org and rebuild the kernel module with the following command:
- rpmbuild --rebuild /path/to/fglrxRPM.src.rpm
Index: fglrx-config-display
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/fglrx-config-display,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fglrx-config-display 26 Dec 2008 03:39:46 -0000 1.2
+++ fglrx-config-display 30 Dec 2008 22:41:05 -0000 1.3
@@ -55,7 +55,7 @@
# Backup the file before make any change.
currentDriver = self.getDriver()
# Already enabled?
- if currentDriver == self.majorVendor:
+ if os.path.exists(self.ldconf):
print _('Driver already enabled.')
return
@@ -101,16 +101,13 @@
Utils.writeFile(self.ldconf,"/usr/lib/fglrx\n")
print _('Running ldconfig, this could take some time...')
Utils.runLdconfig()
- # Haven't heard of this in a while either.
- #if not self.checkForModuleAndRemove("radeon") or not self.checkForModuleAndRemove("drm"):
- # print WARNING_DRI_NOT_AVAILABLE
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
self.restoreconf()
def disable(self, isAutoConfigure=True):
self.removeModulePath("/extensions/fglrx", self.TOP_MOD_DIR)
# Check if it's already disabled
- if self.getDriver() != self.majorVendor:
+ if not os.path.exists(self.ldconf):
print _('Driver already disabled.')
return
# We have to save the status file so it can be restored later
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-fglrx.spec 26 Dec 2008 03:39:46 -0000 1.10
+++ xorg-x11-drv-fglrx.spec 30 Dec 2008 22:41:05 -0000 1.11
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-fglrx
Version: 8.561
-Release: 2.%{ativersion}%{?dist}
+Release: 3.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: BSD/Commercial/GPL/QPL
@@ -227,6 +227,10 @@
chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.xbm.example
chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.sh
+# dri workaround
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/dri
+ln -s ../lib64/fglrx_dri.so $RPM_BUILD_ROOT%{_prefix}/lib/dri/
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -269,7 +273,7 @@
%config %{_sysconfdir}/ati/control
%config %{_sysconfdir}/ati/amdpcsdb.default
%config(noreplace) %{_sysconfdir}/acpi/events/*aticonfig.conf
-%config(noreplace)%{_sysconfdir}/profile.d/fglrx.*
+%config(noreplace) %{_sysconfdir}/profile.d/fglrx.*
%{_initrddir}/*
%{_sbindir}/*
%{_bindir}/*
@@ -283,6 +287,10 @@
%{_mandir}/man[1-9]/atieventsd.*
%{_libdir}/xorg/modules/extensions/fglrx/
%{_libdir}/xorg/modules/*.so
+%{_libdir}/dri/
+%ifarch x86_64
+%{_prefix}/lib/dri/
+%endif
%files libs
%defattr(-,root,root,-)
@@ -290,7 +298,6 @@
%{atilibdir}/*.so*
# FIXME: This file is recognized as "data" - figure out how to move it later
%{atilibdir}/libAMDXvBA.cap
-%{_libdir}/dri/
%files devel
%defattr(-,root,root,-)
@@ -301,6 +308,10 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Sun Dec 28 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-3.8.12
+- Move fglrx_dri.so to monolib package
+- Make fglrx-config-display check the ldfile to see if it's already enabled
+
* Thu Dec 25 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-2.8.12
- Add extra bits to create Screen section in xorg.conf
15 years, 3 months
- 1
- 0