Author: duncan
Date: Fri Sep 22 08:46:14 2006
New Revision: 8226
Added:
branches/rel-1-5/freevo/contrib/patches/
branches/rel-1-5/freevo/contrib/patches/freevo-1.5.4-zh-tv-freq.patch
branches/rel-1-5/freevo/contrib/patches/mplayer-zh-frequencies.patch
branches/rel-1-5/freevo/contrib/patches/pyusb-0.3.3-name.patch
Log:
Added some non-general patches that may be useful to certain users.
Added: branches/rel-1-5/freevo/contrib/patches/freevo-1.5.4-zh-tv-freq.patch
==============================================================================
--- (empty file)
+++ branches/rel-1-5/freevo/contrib/patches/freevo-1.5.4-zh-tv-freq.patch
Fri Sep 22 08:46:14 2006
@@ -0,0 +1,101 @@
+diff -Naur freevo-1.5.4.orig/src/setup_freevo.py
freevo-1.5.4/src/setup_freevo.py
+--- freevo-1.5.4.orig/src/setup_freevo.py 2005-10-16 11:18:50.000000000
+0200
++++ freevo-1.5.4/src/setup_freevo.py 2005-11-11 13:56:19.000000000 +0100
+@@ -5,13 +5,13 @@
+ # This is an application that is executed by the "./freevo" script
+ # after checking for python.
+ # -----------------------------------------------------------------------
+-# $Id: setup_freevo.py 6944 2005-01-09 10:45:55Z dischi $
++# $Id: setup_freevo.py,v 1.18.2.1 2005/01/09 10:45:54 dischi Exp $
+ #
+ # Notes:
+ # Todo:
+ #
+ # -----------------------------------------------------------------------
+-# $Log$
++# $Log: setup_freevo.py,v $
+ # Revision 1.18.2.1 2005/01/09 10:45:54 dischi
+ # support for russian tv
+ #
+@@ -104,7 +104,7 @@
+ japan-bcast, japan-cable, europe-west,
+ europe-east, italy, newzealand, australia,
+ ireland, france, china-bcast, southafrica,
+- argentina, canada-cable
++ argentina, canada-cable, switzerland
+
+ --help display this help and exit
+
+@@ -138,7 +138,7 @@
+ 'japan-bcast', 'japan-cable', 'europe-west',
+ 'europe-east', 'italy', 'newzealand', 'australia',
+ 'ireland', 'france', 'china-bcast', 'southafrica',
+- 'argentina', 'canada-cable','russia']
++ 'argentina', 'canada-cable', 'russia', 'switzerland']
+
+ if not conf.geometry in vals_geometry:
+ print 'geometry must be one of: %s' % ' '.join(vals_geometry)
+diff -Naur freevo-1.5.4.orig/src/tv/freq.py freevo-1.5.4/src/tv/freq.py
+--- freevo-1.5.4.orig/src/tv/freq.py 2005-10-16 11:18:50.000000000 +0200
++++ freevo-1.5.4/src/tv/freq.py 2005-11-11 13:54:48.000000000 +0100
+@@ -1291,6 +1291,54 @@
+ ("69", 855250 ),
+ ]
+
++PAL_SWITZERLAND = [
++ ("K32", 559250 ), # BBC Prime
++ ("S13", 246250 ), # CNN Int.
++ ("K34", 575250 ), # CNBC Europe
++ ("K21", 471250 ), # Arte
++ ("K05", 175500 ), # SF 1
++ ("K10", 211000 ), # SF 2
++ ("K35", 583250 ), # SFinfo
++ ("S23", 319250 ), # EuroNews
++ ("S17", 274500 ), # Eurosport (d + e)
++ ("S05", 133250 ), # ORF 1
++ ("S15", 260250 ), # ORF 2
++ ("S10", 168500 ), # 3sat
++ ("S27", 351250 ), # 3sat
++ ("S19", 288500 ), # SAT 1
++ ("K09", 203750 ), # ARD
++ ("S04", 126250 ), # kabel eins
++ ("K29", 535250 ), # BR
++ ("K27", 519250 ), # PRO 7
++ ("K30", 543250 ), # VOX
++ ("K06", 182750 ), # RTL
++ ("K22", 479250 ), # RTL 2
++ ("S26", 343250 ), # Super RTL
++ ("S31", 383250 ), # WDR
++ ("K11", 218000 ), # ZDF
++ ("K24", 495250 ), # DSF
++ ("K31", 551250 ), # TV5 Europe
++ ("K28", 527250 ), # n-tv
++ ("S09", 161500 ), # Tele Z�ri
++ ("S14", 253250 ), # S�dwest Fernsehen BW
++ ("S07", 147250 ), # Star TV
++ ("S33", 399250 ), # U1 TV STATION
++ ("S20", 295750 ), # MTV
++ ("S24", 327250 ), # VIVA
++ ("S11", 232000 ), # HSE24
++ ("S12", 239250 ), # TF 1
++ ("S28", 359250 ), # France 2
++ ("K07", 189750 ), # TSR 1
++ ("K37", 599250 ), # TSR 2
++ ("K25", 503250 ), # Canale 5
++ ("S08", 154500 ), # RAI UNO
++ ("K08", 196750 ), # TSI 1
++ ("S18", 281500 ), # TSI 2
++ ("K12", 225000 ), # TVE Int.
++ ("S16", 267500 ), # cablecom infokanal
++ ("S06", 140250 ), # Tele M1**
++]
++
+ CHANLIST = {
+ "us-bcast" : dict(NTSC_BCAST),
+ "us-cable" : dict(NTSC_CABLE),
+@@ -1309,4 +1357,5 @@
+ "southafrica" : dict(PAL_BCAST_ZA),
+ "argentina" : dict(ARGENTINA),
+ "russia" : dict(RUSSIA),
++ "switzerland" : dict(PAL_SWITZERLAND),
+ }
Added: branches/rel-1-5/freevo/contrib/patches/mplayer-zh-frequencies.patch
==============================================================================
--- (empty file)
+++ branches/rel-1-5/freevo/contrib/patches/mplayer-zh-frequencies.patch
Fri Sep 22 08:46:14 2006
@@ -0,0 +1,65 @@
+--- main/libmpdemux/frequencies.c.orig 2005-09-01 09:30:16.000000000 +0200
++++ main/libmpdemux/frequencies.c 2005-08-25 08:15:40.000000000 +0200
+@@ -809,6 +809,54 @@
+ FREQ_UHF,
+ };
+
++static struct CHANLIST pal_switzerland[] = {
++ { "K32", 559250 }, // BBC Prime
++ { "S13", 246250 }, // CNN Int.
++ { "K34", 575250 }, // CNBC Europe/NBC Europe
++ { "K21", 471250 }, // Arte/KiKa
++ { "K05", 175500 }, // SF 1
++ { "K10", 211000 }, // SF 2
++ { "K35", 583250 }, // SFinfo
++ { "S23", 319250 }, // EuroNews
++ { "S17", 274500 }, // Eurosport (d + e)
++ { "S05", 133250 }, // ORF 1
++ { "S15", 260250 }, // ORF 2
++ { "S10", 168500 }, // 3sat
++ { "S19", 288500 }, // SAT 1
++ { "K09", 203750 }, // ARD
++ { "S04", 126250 }, // kabel eins
++ { "K29", 535250 }, // BR
++ { "K27", 519250 }, // PRO 7
++ { "K30", 543250 }, // VOX
++ { "K06", 182750 }, // RTL
++ { "K22", 479250 }, // RTL 2
++ { "S26", 343250 }, // Super RTL
++ { "S31", 383250 }, // WDR
++ { "K11", 218000 }, // ZDF
++ { "K24", 495250 }, // DSF
++ { "K31", 551250 }, // TV5 Europe
++ { "K28", 527250 }, // n-tv
++ { "S09", 161500 }, // Tele Z�ri
++ { "S14", 253250 }, // S�dwest Fernsehen BW
++ { "S07", 147250 }, // Star TV
++ { "S33", 399250 }, // U1 TV STATION
++ { "S20", 295750 }, // MTV
++ { "S24", 327250 }, // VIVA
++ { "S11", 232000 }, // HSE24
++ { "S12", 239250 }, // TF 1
++ { "S28", 359250 }, // France 2
++ { "K07", 189750 }, // TSR 1
++ { "K37", 599250 }, // TSR 2
++ { "K25", 503250 }, // Canale 5
++ { "S08", 154500 }, // RAI UNO
++ { "K08", 196750 }, // TSI 1
++ { "S18", 281500 }, // TSI 2
++ { "K12", 225000 }, // TVE Int.
++ { "S16", 267500 }, // cablecom infokanal
++ { "S27", 351250 }, // 3sat
++ { "S06", 140250 }, // Tele M1**
++};
++
+ /* --------------------------------------------------------------------- */
+
+ static struct CHANLIST pal_newzealand[] = {
+@@ -1153,6 +1201,7 @@
+ { "europe-west", europe_west, CHAN_COUNT(europe_west) },
+ { "europe-east", europe_east, CHAN_COUNT(europe_east) },
+ { "italy", pal_italy, CHAN_COUNT(pal_italy)
},
++ { "switzerland", pal_switzerland, CHAN_COUNT(pal_switzerland) },
+ { "newzealand", pal_newzealand, CHAN_COUNT(pal_newzealand) },
+ { "australia", pal_australia, CHAN_COUNT(pal_australia) },
+ { "ireland", pal_ireland, CHAN_COUNT(pal_ireland) },
Added: branches/rel-1-5/freevo/contrib/patches/pyusb-0.3.3-name.patch
==============================================================================
--- (empty file)
+++ branches/rel-1-5/freevo/contrib/patches/pyusb-0.3.3-name.patch Fri Sep
22 08:46:14 2006
@@ -0,0 +1,87 @@
+diff -Naur pyusb-0.3.3.orig/pyusb.c pyusb-0.3.3/pyusb.c
+--- pyusb-0.3.3.orig/pyusb.c 2006-03-22 18:00:22.000000000 +0100
++++ pyusb-0.3.3/pyusb.c 2006-07-27 14:29:29.000000000 +0200
+@@ -339,7 +339,7 @@
+ PYUSB_STATIC PyTypeObject Py_usb_Endpoint_Type = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /*ob_size*/
+- "usb.Endpoint", /*tp_name*/
++ "pyusb.Endpoint", /*tp_name*/
+ sizeof(Py_usb_Endpoint), /*tp_basicsize*/
+ 0, /*tp_itemsize*/
+ 0, /*tp_dealloc*/
+@@ -472,7 +472,7 @@
+ PYUSB_STATIC PyTypeObject Py_usb_Interface_Type = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /*ob_size*/
+- "usb.Interface", /*tp_name*/
++ "pyusb.Interface", /*tp_name*/
+ sizeof(Py_usb_Interface), /*tp_basicsize*/
+ 0, /*tp_itemsize*/
+ Py_usb_Interface_del, /*tp_dealloc*/
+@@ -631,7 +631,7 @@
+ PYUSB_STATIC PyTypeObject Py_usb_Configuration_Type = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /*ob_size*/
+- "usb.Configuration", /*tp_name*/
++ "pyusb.Configuration", /*tp_name*/
+ sizeof(Py_usb_Configuration), /*tp_basicsize*/
+ 0, /*tp_itemsize*/
+ Py_usb_Configuration_del, /*tp_dealloc*/
+@@ -850,7 +850,7 @@
+ PYUSB_STATIC PyTypeObject Py_usb_Device_Type = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /*ob_size*/
+- "usb.Device", /*tp_name*/
++ "pyusb.Device", /*tp_name*/
+ sizeof(Py_usb_Device), /*tp_basicsize*/
+ 0, /*tp_itemsize*/
+ Py_usb_Device_del, /*tp_dealloc*/
+@@ -996,7 +996,7 @@
+ PYUSB_STATIC PyTypeObject Py_usb_Bus_Type = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /*ob_size*/
+- "usb.Bus", /*tp_name*/
++ "pyusb.Bus", /*tp_name*/
+ sizeof(Py_usb_Bus), /*tp_basicsize*/
+ 0, /*tp_itemsize*/
+ Py_usb_Bus_del, /*tp_dealloc*/
+@@ -1870,7 +1870,7 @@
+ PYUSB_STATIC PyTypeObject Py_usb_DeviceHandle_Type = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /*ob_size*/
+- "usb.DeviceHandle", /*tp_name*/
++ "pyusb.DeviceHandle", /*tp_name*/
+ sizeof(Py_usb_DeviceHandle), /*tp_basicsize*/
+ 0, /*tp_itemsize*/
+ Py_usb_DeviceHandle_del, /*tp_dealloc*/
+@@ -1999,14 +1999,14 @@
+ /*
+ * Entry point for the module
+ */
+-PyMODINIT_FUNC initusb(void)
++PyMODINIT_FUNC initpyusb(void)
+ {
+ PyObject *module;
+
+- PyExc_USBError = PyErr_NewException("usb.USBError", PyExc_IOError,
NULL);
++ PyExc_USBError = PyErr_NewException("pyusb.USBError", PyExc_IOError,
NULL);
+ if (!PyExc_USBError) return;
+
+- module = Py_InitModule3("usb", usb_Methods,"USB access module");
++ module = Py_InitModule3("pyusb", usb_Methods,"USB access module");
+ if (!module) return;
+
+ if (PyType_Ready(&Py_usb_Endpoint_Type) < 0) return;
+diff -Naur pyusb-0.3.3.orig/setup.py pyusb-0.3.3/setup.py
+--- pyusb-0.3.3.orig/setup.py 2006-03-22 18:00:22.000000000 +0100
++++ pyusb-0.3.3/setup.py 2006-07-27 14:27:22.000000000 +0200
+@@ -39,7 +39,7 @@
+ extra_compile_args = ['-I/usr/local/include']
+
+
+-usbmodule = Extension(name = 'usb',
++usbmodule = Extension(name = 'pyusb',
+ libraries = libraries,
+ sources = ['pyusb.c'],
+ extra_link_args = extra_link_args,
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
