--- oxine-0.7.1.orig/debian/oxine.menu +++ oxine-0.7.1/debian/oxine.menu @@ -0,0 +1,4 @@ +?package(oxine):needs="X11" section="Applications/Video"\ + title="oxine" longtitle="xine OSD (on screen display) GUI"\ + description="oxine is a lightweight, purely OSD-based xine frontend for set-top boxes and home entertainment systems."\ + command="/usr/bin/oxine" hints="Video" --- oxine-0.7.1.orig/debian/rules +++ oxine-0.7.1/debian/rules @@ -0,0 +1,71 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + CROSS=CC=$(DEB_HOST_GNU_TYPE)-gcc +else + CROSS= +endif + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + rm -f config.guess config.sub + + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + +config.status: configure patch + dh_testdir + +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif + + ./configure $(CROSS) --prefix=/usr --enable-vdr --enable-aex --enable-background-rebuilding --disable-gdkpixbuf pumount_path=/usr/bin CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + +build: build-stamp +build-stamp: config.status + dh_testdir + + $(MAKE) + + touch build-stamp + +install: build + dh_testdir + dh_testroot + dh_prep + + $(MAKE) DESTDIR=$(CURDIR)/debian/oxine install + +binary: binary-arch + +binary-arch: install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installman + dh_installmenu + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-indep: + +.PHONY: clean build install binary binary-arch binary-indep --- oxine-0.7.1.orig/debian/compat +++ oxine-0.7.1/debian/compat @@ -0,0 +1 @@ +7 --- oxine-0.7.1.orig/debian/control +++ oxine-0.7.1/debian/control @@ -0,0 +1,21 @@ +Source: oxine +Section: video +Priority: optional +Maintainer: Debian QA Group +Build-Depends: debhelper (>= 7), quilt, autotools-dev, eject, imagemagick, libcdio-dev, libcurl4-gnutls-dev, libdbus-glib-1-dev, libfam-dev, libhal-dev, libhal-storage-dev, libiso9660-dev, liblircclient-dev, libmagick9-dev, libmdsp-dev, libxml2-utils, libxine-dev, libxinerama-dev, libxtst-dev +Standards-Version: 3.8.2 +Homepage: http://oxine.sourceforge.net/ +Vcs-Browser: http://git.debian.net/?p=debian/oxine.git +Vcs-Git: git://git.debian.net/git/debian/oxine.git + +Package: oxine +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, dbus, gamin | fam, hal +Recommends: cdparanoia, eject, flac, gnome-screensaver, pmount, vorbis-tools +Suggests: lame +Description: xine OSD (on screen display) GUI + oxine is a lightweight, purely OSD-based xine frontend for set-top boxes and + home entertainment systems. It uses the on screen display functionality of xine + to display its user interface elements like buttons, lists, sliders, and so on. + Due to this, oxine can easily use any video output device the xine library + provides. --- oxine-0.7.1.orig/debian/changelog +++ oxine-0.7.1/debian/changelog @@ -0,0 +1,106 @@ +oxine (0.7.1-6) unstable; urgency=low + + * Removing vcs fields. + * Orphaning package. + + -- Daniel Baumann Sun, 09 Aug 2009 01:11:50 +0200 + +oxine (0.7.1-5) unstable; urgency=low + + * Updating package section. + * Prefering gamin over fam (Closes: #537454). + + -- Daniel Baumann Sat, 18 Jul 2009 23:05:49 +0200 + +oxine (0.7.1-4) unstable; urgency=low + + * Adding upstream target in rules file. + * Updating build-depends and recommends. + * Updating depends. + * Replacing obsolete dh_clean -k with dh_prep. + * Using correct rfc-2822 date formats in changelog. + * Updating package to standards version 3.8.2. + * Removing bladeenc from suggests. + * Updating year in copyright file. + * Prefixing debhelper files with package name. + * Adding description field in menu file. + * Removing patch leftovers. + * Updating rules file to current state of the art. + * Adding patch from upstream to fix crash (Closes: #504282). + * Removing unused upstream target in rules. + + -- Daniel Baumann Thu, 16 Jul 2009 17:08:49 +0200 + +oxine (0.7.1-3) unstable; urgency=low + + * Reverting config.guess and config.sub to upstream. + * Removing watch file. + * Upgrading package to debhelper 7. + * Upgrading package to standards 3.8.0. + * Adding vcs fields in control file. + * Rewriting copyright file in machine-interpretable format. + * Reordering rules file. + * Updating todo file. + + -- Daniel Baumann Sat, 18 Oct 2008 20:10:00 +0200 + +oxine (0.7.1-2) unstable; urgency=low + + * Updating depends to oggenc (Closes: #473836). + * Added alternative suggest to bladeenc. + + -- Daniel Baumann Wed, 02 Apr 2008 08:27:00 +0200 + +oxine (0.7.1-1) unstable; urgency=low + + * New upstream release (Closes: #458398). + * Bumping to new policy. + * Using new homepage field in control. + * Updating menu file to new policy. + * Don't hide make errors in clean target of rules. + * Temporarily disabling kfreebsd patch, needs to be updated to new oxine. + * Temporarily building without libjsw, oxine needs a newer version than what + is available in unstable, see #458774. + * Updating build-depends and configure flags for additional library support. + * Adding additional programs to recommends and suggests. + + -- Daniel Baumann Wed, 02 Jan 2008 19:47:00 +0100 + +oxine (0.6.4-4) unstable; urgency=medium + + * Rebuild against libcurl4-gnutls-dev. + + -- Daniel Baumann Wed, 27 Jun 2007 21:14:00 +0200 + +oxine (0.6.4-3) unstable; urgency=medium + + * Rebuild against libcurl4-dev. + + -- Daniel Baumann Sat, 02 Jun 2007 18:40:00 +0200 + +oxine (0.6.4-2) unstable; urgency=low + + * Added patch from Cyril Brulebois to fix + FTBFS on kfreebsd (Closes: #415105). + + -- Daniel Baumann Fri, 16 Mar 2007 18:37:00 +0100 + +oxine (0.6.4-1) unstable; urgency=low + + * New upstream release. + * Bumped package to debhelper 5. + + -- Daniel Baumann Fri, 16 Mar 2007 10:45:00 +0100 + +oxine (0.6.3-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Thu, 14 Dec 2006 01:56:00 +0100 + +oxine (0.5-1) unstable; urgency=low + + * Initial release (Closes: #381429). + * Added manpage. + + -- Daniel Baumann Fri, 04 Aug 2006 11:16:00 +0200 --- oxine-0.7.1.orig/debian/copyright +++ oxine-0.7.1/debian/copyright @@ -0,0 +1,333 @@ +Authors: + Stefan Holst + Maximilian Schwerin +Download: http://oxine.sourceforge.net/ + +Files: * +Copyright: + (C) 2004-2009 Stefan Holst + (C) 2004-2009 Maximilian Schwerin + (C) 2000-2009 the xine project +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: data/* +Copyright: + (C) 2004 Andrew Fitzsimon + (C) 2004 Silvestre Herrera +License: CC-BY-SA-2 + The Dropline Etiquette theme made for Dropline GNOME, a GNOME + distribution for Slackware Linux , + is licensed under the Creative Commons Attribution-ShareAlike 2.0 + license . + . + Create Commons Legal Code + ------------------------- + . + Attribution-ShareAlike 2.0 + . + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION + ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE + INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + ITS USE. + . + License + . + THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE + COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY + COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS + AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + . + BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE + TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE + RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS + AND CONDITIONS. + . + 1. Definitions + . + a. "Collective Work" means a work, such as a periodical issue, anthology + or encyclopedia, in which the Work in its entirety in unmodified form, + along with a number of other contributions, constituting separate and + independent works in themselves, are assembled into a collective whole. + A work that constitutes a Collective Work will not be considered a + Derivative Work (as defined below) for the purposes of this License. + . + b. "Derivative Work" means a work based upon the Work or upon the Work + and other pre-existing works, such as a translation, musical + arrangement, dramatization, fictionalization, motion picture version, + sound recording, art reproduction, abridgment, condensation, or any + other form in which the Work may be recast, transformed, or adapted, + except that a work that constitutes a Collective Work will not be + considered a Derivative Work for the purpose of this License. For the + avoidance of doubt, where the Work is a musical composition or sound + recording, the synchronization of the Work in timed-relation with a + moving image ("synching") will be considered a Derivative Work for the + purpose of this License. + . + c. "Licensor" means the individual or entity that offers the Work under + the terms of this License. + . + d. "Original Author" means the individual or entity who created the + Work. + . + e. "Work" means the copyrightable work of authorship offered under the + terms of this License. + . + f. "You" means an individual or entity exercising rights under this + License who has not previously violated the terms of this License with + respect to the Work, or who has received express permission from the + Licensor to exercise rights under this License despite a previous + violation. + . + g. "License Elements" means the following high-level license attributes + as selected by Licensor and indicated in the title of this License: + Attribution, ShareAlike. + . + 2. Fair Use Rights. + . + Nothing in this license is intended to reduce, limit, or restrict any + rights arising from fair use, first sale or other limitations on the + exclusive rights of the copyright owner under copyright law or other + applicable laws. + . + 3. License Grant. + . + Subject to the terms and conditions of this License, Licensor hereby + grants You a worldwide, royalty-free, non-exclusive, perpetual (for the + duration of the applicable copyright) license to exercise the rights in + the Work as stated below: + . + a. to reproduce the Work, to incorporate the Work into one or more + Collective Works, and to reproduce the Work as incorporated in the + Collective Works; + . + b. to create and reproduce Derivative Works; + . + c. to distribute copies or phonorecords of, display publicly, perform + publicly, and perform publicly by means of a digital audio transmission + the Work including as incorporated in Collective Works; + . + d. to distribute copies or phonorecords of, display publicly, perform + publicly, and perform publicly by means of a digital audio transmission + Derivative Works. + . + e. For the avoidance of doubt, where the work is a musical composition: + . + i. Performance Royalties Under Blanket Licenses. + Licensor waives the exclusive right to collect, whether individually or + via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for + the public performance or public digital performance (e.g. webcast) of + the Work. + . + ii. Mechanical Rights and Statutory Royalties. + Licensor waives the exclusive right to collect, whether individually or + via a music rights society or designated agent (e.g. Harry Fox Agency), + royalties for any phonorecord You create from the Work ("cover version") + and distribute, subject to the compulsory license created by 17 USC + Section 115 of the US Copyright Act (or the equivalent in other + jurisdictions). + . + f. Webcasting Rights and Statutory Royalties. For the avoidance of + doubt, where the Work is a sound recording, Licensor waives the + exclusive right to collect, whether individually or via a + performance-rights society (e.g. SoundExchange), royalties for the + public digital performance (e.g. webcast) of the Work, subject to the + compulsory license created by 17 USC Section 114 of the US Copyright Act + (or the equivalent in other jurisdictions). + . + The above rights may be exercised in all media and formats whether now + known or hereafter devised. The above rights include the right to make + such modifications as are technically necessary to exercise the rights + in other media and formats. All rights not expressly granted by Licensor + are hereby reserved. + . + 4. Restrictions. + . + The license granted in Section 3 above is expressly made subject to and + limited by the following restrictions: + . + a. You may distribute, publicly display, publicly perform, or publicly + digitally perform the Work only under the terms of this License, and You + must include a copy of, or the Uniform Resource Identifier for, this + License with every copy or phonorecord of the Work You distribute, + publicly display, publicly perform, or publicly digitally perform. You + may not offer or impose any terms on the Work that alter or restrict the + terms of this License or the recipients' exercise of the rights granted + hereunder. You may not sublicense the Work. You must keep intact all + notices that refer to this License and to the disclaimer of warranties. + You may not distribute, publicly display, publicly perform, or publicly + digitally perform the Work with any technological measures that control + access or use of the Work in a manner inconsistent with the terms of + this License Agreement. The above applies to the Work as incorporated in + a Collective Work, but this does not require the Collective Work apart + from the Work itself to be made subject to the terms of this License. If + You create a Collective Work, upon notice from any Licensor You must, to + the extent practicable, remove from the Collective Work any reference to + such Licensor or the Original Author, as requested. If You create a + Derivative Work, upon notice from any Licensor You must, to the extent + practicable, remove from the Derivative Work any reference to such + Licensor or the Original Author, as requested. + . + b. You may distribute, publicly display, publicly perform, or publicly + digitally perform a Derivative Work only under the terms of this + License, a later version of this License with the same License Elements + as this License, or a Creative Commons iCommons license that contains + the same License Elements as this License (e.g. Attribution-ShareAlike + 2.0 Japan). You must include a copy of, or the Uniform Resource + Identifier for, this License or other license specified in the previous + sentence with every copy or phonorecord of each Derivative Work You + distribute, publicly display, publicly perform, or publicly digitally + perform. You may not offer or impose any terms on the Derivative Works + that alter or restrict the terms of this License or the recipients' + exercise of the rights granted hereunder, and You must keep intact all + notices that refer to this License and to the disclaimer of warranties. + You may not distribute, publicly display, publicly perform, or publicly + digitally perform the Derivative Work with any technological measures + that control access or use of the Work in a manner inconsistent with the + terms of this License Agreement. The above applies to the Derivative + Work as incorporated in a Collective Work, but this does not require the + Collective Work apart from the Derivative Work itself to be made subject + to the terms of this License. + . + c. If you distribute, publicly display, publicly perform, or publicly + digitally perform the Work or any Derivative Works or Collective Works, + You must keep intact all copyright notices for the Work and give the + Original Author credit reasonable to the medium or means You are + utilizing by conveying the name (or pseudonym if applicable) of the + Original Author if supplied; the title of the Work if supplied; to the + extent reasonably practicable, the Uniform Resource Identifier, if any, + that Licensor specifies to be associated with the Work, unless such URI + does not refer to the copyright notice or licensing information for the + Work; and in the case of a Derivative Work, a credit identifying the use + of the Work in the Derivative Work (e.g., "French translation of the + Work by Original Author," or "Screenplay based on original Work by + Original Author"). Such credit may be implemented in any reasonable + manner; provided, however, that in the case of a Derivative Work or + Collective Work, at a minimum such credit will appear where any other + comparable authorship credit appears and in a manner at least as + prominent as such other comparable authorship credit. + . + 5. Representations, Warranties and Disclaimer + . + UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS + THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND + CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, + INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, + FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF + LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, + WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + . + 6. Limitation on Liability. + . + EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL + LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF + THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED + OF THE POSSIBILITY OF SUCH DAMAGES. + . + 7. Termination + . + a. This License and the rights granted hereunder will terminate + automatically upon any breach by You of the terms of this License. + Individuals or entities who have received Derivative Works or Collective + Works from You under this License, however, will not have their licenses + terminated provided such individuals or entities remain in full + compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will + survive any termination of this License. + . + b. Subject to the above terms and conditions, the license granted here + is perpetual (for the duration of the applicable copyright in the Work). + Notwithstanding the above, Licensor reserves the right to release the + Work under different license terms or to stop distributing the Work at + any time; provided, however that any such election will not serve to + withdraw this License (or any other license that has been, or is + required to be, granted under the terms of this License), and this + License will continue in full force and effect unless terminated as + stated above. + . + 8. Miscellaneous + . + a. Each time You distribute or publicly digitally perform the Work or a + Collective Work, the Licensor offers to the recipient a license to the + Work on the same terms and conditions as the license granted to You + under this License. + . + b. Each time You distribute or publicly digitally perform a Derivative + Work, Licensor offers to the recipient a license to the original Work on + the same terms and conditions as the license granted to You under this + License. + . + c. If any provision of this License is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of + the remainder of the terms of this License, and without further action + by the parties to this agreement, such provision shall be reformed to + the minimum extent necessary to make such provision valid and + enforceable. + . + d. No term or provision of this License shall be deemed waived and no + breach consented to unless such waiver or consent shall be in writing + and signed by the party to be charged with such waiver or consent. + . + e. This License constitutes the entire agreement between the parties + with respect to the Work licensed here. There are no understandings, + agreements or representations with respect to the Work not specified + here. Licensor shall not be bound by any additional provisions that may + appear in any communication from You. This License may not be modified + without the mutual written agreement of the Licensor and You. + . + Creative Commons is not a party to this License, and makes no warranty + whatsoever in connection with the Work. Creative Commons will not be + liable to You or any party on any legal theory for any damages + whatsoever, including without limitation any general, special, + incidental or consequential damages arising in connection to this + license. Notwithstanding the foregoing two (2) sentences, if Creative + Commons has expressly identified itself as the Licensor hereunder, it + shall have all rights and obligations of Licensor. + . + Except for the limited purpose of indicating to the public that the Work + is licensed under the CCPL, neither party will use the trademark + "Creative Commons" or any related trademark or logo of Creative Commons + without the prior written consent of Creative Commons. Any permitted use + will be in compliance with Creative Commons' then-current trademark + usage guidelines, as may be published on its website or otherwise made + available upon request from time to time. + . + Creative Commons may be contacted at http://creativecommons.org/. + +Files: debian/* +Copyright: (C) 2006-2009 Daniel Baumann +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. --- oxine-0.7.1.orig/debian/oxine.docs +++ oxine-0.7.1/debian/oxine.docs @@ -0,0 +1 @@ +AUTHORS --- oxine-0.7.1.orig/debian/TODO +++ oxine-0.7.1/debian/TODO @@ -0,0 +1,3 @@ +* update manpage +* enable metar +* package l10n images and skins --- oxine-0.7.1.orig/debian/oxine.manpages +++ oxine-0.7.1/debian/oxine.manpages @@ -0,0 +1 @@ +debian/manpages/* --- oxine-0.7.1.orig/debian/patches/01-crash.patch +++ oxine-0.7.1/debian/patches/01-crash.patch @@ -0,0 +1,223 @@ +Author: Maximilian Schwerin +Description: Fixes crash (Closes: #504282). + +diff -Naurp oxine.orig/src/odk_osd.c oxine/src/odk_osd.c +--- oxine.orig/src/odk_osd.c 2009-07-16 15:02:12.000000000 +0000 ++++ oxine/src/odk_osd.c 2009-07-16 15:06:36.000000000 +0000 +@@ -57,40 +57,22 @@ + #include "odk_private.h" + #include "utils.h" + +- +-#ifdef DEBUG +-#define VALIDATE_POINT(x,y) { \ +- if ((x < 0) \ +- || (x >= odk->osd.width)) { \ +- fatal ("x-value is outside " \ +- "the valid drawing " \ +- "area: 0 <= %d <= %d", \ +- x, odk->osd.width); \ +- assert (x >= 0); \ +- assert (x < odk->osd.width); \ +- } \ +- if ((y < 0) \ +- || (y >= odk->osd.height)) { \ +- fatal ("y-value is outside " \ +- "the valid drawing " \ +- "area: 0 <= %d <= %d", \ +- y, odk->osd.height); \ +- assert (y >= 0); \ +- assert (y < odk->osd.height); \ +- } \ +-} +-#else +-#define VALIDATE_POINT(x,y) { \ +- if ((x < 0) \ +- || (x >= odk->osd.width)) { \ +- return; \ +- } \ +- if ((y < 0) \ +- || (y >= odk->osd.height)) { \ +- return; \ +- } \ ++#define VALIDATE_POINT(x,y) { \ ++ if (((x) < 0) || ((x) >= odk->osd.width)) { \ ++ debug ("x-value is outside " \ ++ "the valid drawing " \ ++ "area: 0 <= %d < %d", \ ++ x, odk->osd.width); \ ++ return; \ ++ } \ ++ if (((y) < 0) || ((y) >= odk->osd.height)) {\ ++ debug ("y-value is outside " \ ++ "the valid drawing " \ ++ "area: 0 <= %d < %d", \ ++ y, odk->osd.height); \ ++ return; \ ++ } \ + } +-#endif + + #define CLAMP(x, low, high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x))) + +@@ -1294,11 +1276,11 @@ odk_draw_vector (odk_t * odk, int x, int + case OSD_VECTOR_ARROW_DOWN: + { + int x1 = x; +- int y1 = y; ++ int y1 = y + (h / 2); + int x2 = x + w; +- int y2 = y; ++ int y2 = y + (h / 2); + int x3 = x + (w / 2); +- int y3 = y + (h / 2); ++ int y3 = y + h; + odk_draw_triangle (odk, x1, y1, x2, y2, x3, y3, color, true); + } + { +@@ -1438,24 +1420,26 @@ odk_draw_line (odk_t * odk, int x1, int + + + typedef struct { +- double x; +- double y; ++ int x; ++ int y; + } point_t; + ++ + static void + swap_points (point_t * p1, point_t * p2) + { +- double x = p1->x; +- double y = p1->y; ++ int x = p1->x; ++ int y = p1->y; + p1->x = p2->x; + p1->y = p2->y; + p2->x = x; + p2->y = y; + } + ++ + static void +-line_draw (odk_t * odk, int minx, int miny, int maxx, int maxy, point_t * p1, +- point_t * p2, int color) ++line_draw (odk_t * odk, int minx, int miny, int maxx, int maxy, ++ point_t * p1, point_t * p2, int color) + { + if (p1->x > maxx) + p1->x = maxx; +@@ -1488,7 +1472,9 @@ odk_draw_triangle (odk_t * odk, int x1, + if (!(odk->osd.hscale && odk->osd.vscale)) + return; + +- point_t p[3]; ++ /* This is necessary for this code to work in some versions of gcc. I have ++ * no idea why this is the case though... */ ++ volatile point_t p[3]; + + p[0].x = round ((double) x1 * odk->osd.hscale); + p[0].y = round ((double) y1 * odk->osd.vscale); +@@ -1502,47 +1488,55 @@ odk_draw_triangle (odk_t * odk, int x1, + int j = i; + for (; j < 3; j++) { + if (p[i].y > p[j].y) { +- swap_points (&p[i], &p[j]); ++ swap_points ((point_t *) & p[i], (point_t *) & p[j]); + } +- else if ((p[i].y == p[j].y) +- && (p[i].x > p[j].x)) { +- swap_points (&p[i], &p[j]); ++ else if ((p[i].y == p[j].y) && (p[i].x > p[j].x)) { ++ swap_points ((point_t *) & p[i], (point_t *) & p[j]); + } + } + } + ++#ifdef DEBUG + assert (p[0].y <= p[1].y); + assert (p[1].y <= p[2].y); ++#endif + + int minx = odk->osd.width; + int maxx = 0; + int miny = odk->osd.height; + int maxy = 0; + for (i = 0; i < 3; i++) { +- if (p[i].x < minx) ++ if (p[i].x < minx) { + minx = p[i].x; +- if (p[i].x > maxx) ++ } ++ if (p[i].x > maxx) { + maxx = p[i].x; +- if (p[i].y < miny) ++ } ++ if (p[i].y < miny) { + miny = p[i].y; +- if (p[i].y > maxy) ++ } ++ if (p[i].y > maxy) { + maxy = p[i].y; ++ } + } + + if (filled) { +- point_t *A = &p[0]; +- point_t *B = &p[1]; +- point_t *C = &p[2]; ++ point_t *A = (point_t *) & p[0]; ++ point_t *B = (point_t *) & p[1]; ++ point_t *C = (point_t *) & p[2]; + +- double dx1 = 0; +- if (B->y - A->y > 0) ++ int dx1 = 0; ++ if (B->y - A->y > 0) { + dx1 = (B->x - A->x) / (B->y - A->y); +- double dx2 = 0; +- if (C->y - A->y > 0) ++ } ++ int dx2 = 0; ++ if (C->y - A->y > 0) { + dx2 = (C->x - A->x) / (C->y - A->y); +- double dx3 = 0; +- if (C->y - B->y > 0) ++ } ++ int dx3 = 0; ++ if (C->y - B->y > 0) { + dx3 = (C->x - B->x) / (C->y - B->y); ++ } + + point_t s; + point_t *S = &s; +@@ -1553,20 +1547,24 @@ odk_draw_triangle (odk_t * odk, int x1, + E->x = A->x; + E->y = A->y; + if (dx1 > dx2) { +- for (; S->y <= B->y; S->y++, E->y++, S->x += dx2, E->x += dx1) ++ for (; S->y <= B->y; S->y++, E->y++, S->x += dx2, E->x += dx1) { + line_draw (odk, minx, miny, maxx, maxy, S, E, color); ++ } + E->x = B->x; + E->y = B->y; +- for (; S->y <= C->y; S->y++, E->y++, S->x += dx2, E->x += dx3) ++ for (; S->y <= C->y; S->y++, E->y++, S->x += dx2, E->x += dx3) { + line_draw (odk, minx, miny, maxx, maxy, S, E, color); ++ } + } + else { +- for (; S->y <= B->y; S->y++, E->y++, S->x += dx1, E->x += dx2) ++ for (; S->y <= B->y; S->y++, E->y++, S->x += dx1, E->x += dx2) { + line_draw (odk, minx, miny, maxx, maxy, S, E, color); ++ } + S->x = B->x; + S->y = B->y; +- for (; S->y <= C->y; S->y++, E->y++, S->x += dx3, E->x += dx2) ++ for (; S->y <= C->y; S->y++, E->y++, S->x += dx3, E->x += dx2) { + line_draw (odk, minx, miny, maxx, maxy, S, E, color); ++ } + } + } + --- oxine-0.7.1.orig/debian/patches/series +++ oxine-0.7.1/debian/patches/series @@ -0,0 +1 @@ +01-crash.patch --- oxine-0.7.1.orig/debian/manpages/oxine.1 +++ oxine-0.7.1/debian/manpages/oxine.1 @@ -0,0 +1,84 @@ +.TH OXINE 1 "Fri, 4 Aug 2006" "0.5" "xine OSD" + +.SH NAME +oxine \- lightweight, purely OSD-based xine frontend + +.SH SYNOPSIS +.B oxine +.RB [\| \-A \||\| \-\-audio-driver +.IR DRIVER \|] +.RB [\| \-f \||\| \-\-fullscreen \|] +.RB [\| \-J \||\| \-\-no-jostick \|] +.RB [\| \-L \||\| \-\-no-lirc \|] +.RB [\| \-P \||\| \-\-no-polling \|] +.RI "[\-\-verbose [\|="LEVEL \|]\|] +.RB [\| \-V \||\| \-\-video-driver +.IR DRIVER \|] +.RI [\| MRL \|] +.PP +.B oxine +.RB [\| \-h \||\| \-\-help \|] +.br +.B oxine +.RB [\| \-v \||\| \-\-version \|] + +.SH DESCRIPTION +.B oxine +is a lightweight, purely OSD-based xine frontend for set-top boxes and home +entertainment systems. It uses the on screen display functionality of xine to +display its user interface elements like buttons, lists, sliders, and so on. Due +to this, +.B oxine +can easily use any video output device the xine library provides. +.PP + +.SH OPTIONS +.TP +.BI "\-A, \-\-audio-driver " DRIVER +Select audio driver by ID. Available drivers: alsa oss arts esd file none. +.TP +.B \-f, \-\-fullscreen +Start in fullscreen mode. +.TP +.B \-h, \-\-help +Show summary of options. +.TP +.B \-J, \-\-no-joystick +Turn off joystick support. +.TP +.B \-L, \-\-no-lirc +Turn off LIRC support. +.TP +.B \-P, \-\-no-polling +Disable disc polling. +.TP +.B \-v, \-\-version +Display version. +.TP +.BI "\-\-verbose [\|="LEVEL \|] +Set verbosity level. Default is 0. +.TP +.BI "\-V, \-\-video-driver " DRIVER +Select video driver by ID. Available drivers: auto xv opengl xshm. +.TP +.B MRL +examples for valid MRLs (media resource locator): + File: 'path/foo.vob' + '/path/foo.vob' + 'file://path/foo.vob' + 'fifo://[[mpeg1|mpeg2]:/]path/foo' + 'stdin://[mpeg1|mpeg2]' + DVD: 'dvd://VTS_01_2.VOB' + 'dvd://path/foo.iso' + 'dvd://' + VCD: 'vcd://' + +.SH SEE ALSO +.BR xine (1) + +.SH AUTHOR +oxine was written by Stefan Holst and Maximilian +Schwerin . +.PP +This manual page was written by Daniel Baumann for the +Debian Project (but may be used by others).