rpms/xine-ui/devel xine-ui-0.99.8-fix_crash_on_exit.patch, NONE, 1.1 xine-ui-0.99.8-update_french_translation.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 xine-ui.spec, 1.3, 1.4
Xavier Bachelot
xavierb at rpmfusion.org
Tue Mar 25 17:49:27 CET 2014
Author: xavierb
Update of /cvs/free/rpms/xine-ui/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23791
Modified Files:
.cvsignore xine-ui.spec
Added Files:
xine-ui-0.99.8-fix_crash_on_exit.patch
xine-ui-0.99.8-update_french_translation.patch
Log Message:
spec clean up
xine-ui-0.99.8-fix_crash_on_exit.patch:
main.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- NEW FILE xine-ui-0.99.8-fix_crash_on_exit.patch ---
# HG changeset patch
# User Darren Salt <devspam at moreofthesa.me.uk>
# Date 1394989339 0
# Sun Mar 16 17:02:19 2014 +0000
# Node ID 702c252f32002c167b1755bd0a6f159f511fa271
# Parent 8c0acbb8fcbb765120eb31ca637ecf82a1f213e4
Fix another UI-related crash on exit.
diff -r 8c0acbb8fcbb -r 702c252f3200 src/xitk/main.c
--- a/src/xitk/main.c Sun Mar 16 16:59:38 2014 +0000
+++ b/src/xitk/main.c Sun Mar 16 17:02:19 2014 +0000
@@ -1255,8 +1255,10 @@
gGui->mixer.volume_level = (aevent->left + aevent->right) / 2;
if(gGui->mixer.method == SOUND_CARD_MIXER) {
gGui->mixer.mute = aevent->mute;
- xitk_slider_set_pos(panel->mixer.slider, gGui->mixer.volume_level);
- xitk_checkbox_set_state(panel->mixer.mute, gGui->mixer.mute);
+ if (panel) {
+ xitk_slider_set_pos(panel->mixer.slider, gGui->mixer.volume_level);
+ xitk_checkbox_set_state(panel->mixer.mute, gGui->mixer.mute);
+ }
}
}
break;
xine-ui-0.99.8-update_french_translation.patch:
fr.po | 997 ++++++++++++++++++++++++++++++++----------------------------------
1 file changed, 495 insertions(+), 502 deletions(-)
--- NEW FILE xine-ui-0.99.8-update_french_translation.patch ---
# HG changeset patch
# User Xavier Bachelot <xavier at bachelot.org>
# Date 1394743315 -3600
# Thu Mar 13 21:41:55 2014 +0100
# Node ID a4dfc83b9ff952add61b02d9a25f402763770d85
# Parent b340d5bdeed6d6d60763302a6f48eeafc77c2dec
Update french translation
diff -r b340d5bdeed6 -r a4dfc83b9ff9 po/fr.po
--- a/po/fr.po Tue Feb 25 17:54:35 2014 +0000
+++ b/po/fr.po Thu Mar 13 21:41:55 2014 +0100
@@ -7,13 +7,14 @@
"Project-Id-Version: xine-ui 0.9.21\n"
"Report-Msgid-Bugs-To: xine-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2014-02-25 17:44+0000\n"
-"PO-Revision-Date: 2007-04-25 00:55+0200\n"
-"Last-Translator: Daniel Caujolle-Bert <segfault at club-internet.fr>\n"
+"PO-Revision-Date: 2014-03-13 21:40+0100\n"
+"Last-Translator: Xavier Bachelot <xavier at bachelot.org>\n"
"Language-Team: French <fr at li.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
#. TRANSLATORS: only ASCII characters (skin)
msgctxt "skin"
@@ -24,38 +25,37 @@
msgid ""
"The stream '%s' isn't supported by xine:\n"
"\n"
-msgstr "Le flux '%s' n'est pas supporté par xine:\n"
+msgstr "Le flux '%s' n'est pas supporté par xine:\n"
#, c-format
msgid ""
"The stream '%s' uses an unsupported codec:\n"
"\n"
-msgstr "Le flux '%s' utilise un codec non supporté:\n"
-
-#, fuzzy, c-format
+msgstr "Le flux '%s' utilise un codec non supporté:\n"
+
+#, c-format
msgid "Video Codec: %s (%s)\n"
-msgstr "%sCodec Vidéo: %s (%s)\n"
+msgstr "Codec Vidéo: %s (%s)\n"
msgid "Unavailable"
msgstr "Non Disponible"
-#, fuzzy, c-format
+#, c-format
msgid "Audio Codec: %s (%s)\n"
-msgstr "%sCodec Audio: %s (%s)\n"
+msgstr "Codec Audio: %s (%s)\n"
msgid "Start Playback ?"
msgstr "Lance la Lecture ?\""
-#, fuzzy
msgid ""
"\n"
"Start playback anyway ?\n"
msgstr ""
-"%s\n"
-"Lance la lecture quand même ?\n"
+"\n"
+"Lance la lecture quand même ?\n"
msgid "No MRL (input stream) specified"
-msgstr "Pas de MRL (flux d'entrée) spécifié."
+msgstr "Pas de MRL (flux d'entrée) spécifié."
#, c-format
msgid "Aspect ratio: %s"
@@ -63,7 +63,7 @@
#, c-format
msgid "Deinterlace: %s"
-msgstr "Désentrelacement: %s"
+msgstr "Désentrelacement: %s"
msgid "enabled"
msgstr "en fonction"
@@ -73,11 +73,11 @@
#, c-format
msgid "%s(): can't create new thread (%s)\n"
-msgstr "%s(): ne peux pas créer le nouveau thread (%s)\n"
+msgstr "%s(): ne peux pas créer le nouveau thread (%s)\n"
#, c-format
msgid "Video post plugins: %s."
-msgstr "Post plugins vidéo: %s."
+msgstr "Post plugins vidéo: %s."
msgid "Amplification Level"
msgstr "Niveau d'Amplification"
@@ -95,13 +95,13 @@
#, c-format
msgid "XSendEvent(display, 0x%x ...) failed.\n"
-msgstr "XSendEvent(display, 0x%x ...) a échoué.\n"
+msgstr "XSendEvent(display, 0x%x ...) a échoué.\n"
msgid "Select"
msgstr "Choisir"
msgid "Select all"
-msgstr "Tout selectionner"
+msgstr "Tout sélectionner"
msgid "Stream(s) Loading"
msgstr "Chargement de flux "
@@ -122,26 +122,26 @@
msgstr "Contraste"
msgid "Gamma"
-msgstr ""
+msgstr "Gamma"
msgid "Sharpness"
-msgstr ""
+msgstr "Netteté"
msgid "Noise reduction"
-msgstr ""
+msgstr "Réduction du bruit"
#, c-format
msgid "%s(): couldn't find image for background\n"
msgstr "%s() : ne trouve pas l'image de fond.\n"
msgid "xine Control Window"
-msgstr "Fenêtre de contrôle de xine"
+msgstr "Fenêtre de contrôle de xine"
msgid "control: couldn't find image for background\n"
msgstr "control: ne trouve pas l'image de fond.\n"
msgid "Control HUE value"
-msgstr "Contrôle la TEINTE"
+msgstr "Contrôle la TEINTE"
#. TRANSLATORS: only ASCII characters (skin)
msgctxt "skin"
@@ -149,7 +149,7 @@
msgstr "Tte"
msgid "Control SATURATION value"
-msgstr "Contrôle la SATURATION"
+msgstr "Contrôle la SATURATION"
#. TRANSLATORS: only ASCII characters (skin)
msgctxt "skin"
@@ -157,7 +157,7 @@
msgstr "Sat"
msgid "Control BRIGHTNESS value"
-msgstr "Contrôle la BRILLANCE"
+msgstr "Contrôle la BRILLANCE"
#. TRANSLATORS: only ASCII characters (skin)
msgctxt "skin"
@@ -165,40 +165,36 @@
msgstr "Bri"
msgid "Control CONTRAST value"
-msgstr "Contrôle le CONTRASTE"
+msgstr "Contrôle le CONTRASTE"
#. TRANSLATORS: only ASCII characters (skin)
msgctxt "skin"
msgid "Ctr"
msgstr "Ctr"
-#, fuzzy
msgid "Control GAMMA value"
-msgstr "Contrôle la TEINTE"
+msgstr "Contrôle le GAMMA"
#. TRANSLATORS: only ASCII characters (skin)
msgctxt "skin"
msgid "Gam"
-msgstr ""
-
-#, fuzzy
+msgstr "Gam"
+
msgid "Control SHARPNESS value"
-msgstr "Contrôle la BRILLANCE"
+msgstr "Contrôle la NETTETE"
#. TRANSLATORS: only ASCII characters (skin)
-#, fuzzy
msgctxt "skin"
[...2395 lines suppressed...]
-#~ " 'shuffle+': identique à shuffle, mais "
-#~ "rejoue indéfiniement la liste de lecture.\n"
+#~ " 'shuffle+': identique à shuffle, mais "
+#~ "rejoue indéfiniement la liste de lecture.\n"
#~ msgid " -S, --session <option1,option2,...>\n"
#~ msgstr " -S, --session <option1, option2,...>\n"
@@ -2777,42 +2770,42 @@
#~ " Session managements. Options can be:\n"
#~ msgstr ""
#~ " Gestion de sessions. les options peuvent "
-#~ "êtres:\n"
+#~ "êtres:\n"
#~ msgid " session=n specify session <n> number,\n"
#~ msgstr ""
-#~ " session=n spécifie le numéro de session <n>,\n"
+#~ " session=n spécifie le numéro de session <n>,\n"
#~ msgid " mrl=m add mrl <m> to the playlist,\n"
#~ msgstr ""
-#~ " mrl=m ajoute la mrl <m> à la liste de lecture,\n"
+#~ " mrl=m ajoute la mrl <m> Ã la liste de lecture,\n"
#~ "\n"
#~ msgid ""
#~ " audio=c select audio channel (<c>: 'next' or "
#~ "'prev'),\n"
#~ msgstr ""
-#~ " audio=c sélectionne le canal audio (<c>: 'next' "
+#~ " audio=c sélectionne le canal audio (<c>: 'next' "
#~ "ou 'prev')\n"
#~ msgid ""
#~ " spu=c select spu channel (<c>: 'next' or "
#~ "'prev'),\n"
#~ msgstr ""
-#~ " spu=c sélectionne le canal de sous-titre (<c>: "
+#~ " spu=c sélectionne le canal de sous-titre (<c>: "
#~ "'next' ou 'prev')\n"
#~ msgid " volume=v set audio volume,\n"
-#~ msgstr " volume=v règle le volume audio,\n"
+#~ msgstr " volume=v règle le volume audio,\n"
#~ msgid " amp=v set amplification level,\n"
-#~ msgstr " amp=v règle le niveau d'amplification,\n"
+#~ msgstr " amp=v règle le niveau d'amplification,\n"
#~ msgid ""
#~ " loop=m set loop mode (<m>: 'none' 'loop' "
#~ "'repeat' 'shuffle' or 'shuffle+'),\n"
#~ msgstr ""
-#~ " loop=m sélectionne le mode de boucle (<m>: "
+#~ " loop=m sélectionne le mode de boucle (<m>: "
#~ "'none'\n"
#~ " 'loop' 'repeat' 'shuffle' ou 'shuffle"
#~ "+'),\n"
@@ -2821,7 +2814,7 @@
#~ msgstr " (playlist|pl)=p\n"
#~ msgid " <p> can be:\n"
-#~ msgstr " <p> peux être:\n"
+#~ msgstr " <p> peux être:\n"
#~ msgid " 'clear' clear the playlist,\n"
#~ msgstr ""
@@ -2831,7 +2824,7 @@
#~ " 'first' play first entry in the "
#~ "playlist,\n"
#~ msgstr ""
-#~ " 'first' lis la première entrée dans "
+#~ " 'first' lis la première entrée dans "
#~ "la\n"
#~ " liste de lecture,\n"
@@ -2839,18 +2832,18 @@
#~ " 'prev' play previous playlist "
#~ "entry,\n"
#~ msgstr ""
-#~ " 'prev' joue l'entrée précédente,\n"
+#~ " 'prev' joue l'entrée précédente,\n"
#~ msgid ""
#~ " 'next' play next playlist entry,\n"
#~ msgstr ""
-#~ " 'next' joue l'entrée suivante,\n"
+#~ " 'next' joue l'entrée suivante,\n"
#~ msgid ""
#~ " 'last' play last entry in the "
#~ "playlist,\n"
#~ msgstr ""
-#~ " 'last' lis la dernière entrée dans\n"
+#~ " 'last' lis la dernière entrée dans\n"
#~ " la liste de lecture,\n"
#~ msgid ""
@@ -2862,7 +2855,7 @@
#~ " 'stop' stop playback at the end of "
#~ "current playback.\n"
#~ msgstr ""
-#~ " 'stop' arrête la lecture à la fin de "
+#~ " 'stop' arrête la lecture à la fin de "
#~ "la \n"
#~ " lecture en cours,\n"
@@ -2870,7 +2863,7 @@
#~ " 'cont' continue playback at the end "
#~ "of current playback.\n"
#~ msgstr ""
-#~ " 'cont' continue la lecture à la fin "
+#~ " 'cont' continue la lecture à la fin "
#~ "de la\n"
#~ " lecture en cours,\n"
@@ -2884,17 +2877,17 @@
#~ " -r, --aspect-ratio <mode> Set aspect ratio of video output. Modes "
#~ "are:\n"
#~ msgstr ""
-#~ " -r, --aspect-ratio <mode> Défini le ratio d'aspect le la sortie "
-#~ "vidéo. Les modes sont:\n"
+#~ " -r, --aspect-ratio <mode> Défini le ratio d'aspect le la sortie "
+#~ "vidéo. Les modes sont:\n"
#~ msgid ""
#~ " --broadcast-port <port> Set port of xine broadcaster (master "
#~ "side)\n"
#~ msgstr ""
-#~ " --broadcast-port <port> Défini le port de diffusion (coté maitre)\n"
+#~ " --broadcast-port <port> Défini le port de diffusion (coté maitre)\n"
#~ msgid " --post <plugin>[:parameter=value][,...][;...]\n"
-#~ msgstr " --post <plugin>[:paramètre=valeur][,...][;...]\n"
+#~ msgstr " --post <plugin>[:paramètre=valeur][,...][;...]\n"
#~ msgid " Load one or many post plugin(s).\n"
#~ msgstr ""
@@ -2903,14 +2896,14 @@
#~ msgid " Parameters are comma separated.\n"
#~ msgstr ""
-#~ " Les paramètres sont séparés par des "
+#~ " Les paramètres sont séparés par des "
#~ "virgules.\n"
#~ msgid ""
#~ " This option can be used more than one "
#~ "time.\n"
#~ msgstr ""
-#~ " Cette option peut être utlisée plus d'une "
+#~ " Cette option peut être utlisée plus d'une "
#~ "fois.\n"
#~ msgid ""
@@ -2921,7 +2914,7 @@
#~ "disponibles,\n"
#~ msgid " Optional <type> can be:\n"
-#~ msgstr " Le <type> optionel peut être:\n"
+#~ msgstr " Le <type> optionel peut être:\n"
#~ msgid " audio_out, video_out, demux, input, sub, post,\n"
#~ msgstr ""
@@ -2949,13 +2942,13 @@
#~ "fichier\n"
#~ msgid " BUG-REPORT.TXT.\n"
-#~ msgstr " nommé BUG-REPORT.TXT.\n"
+#~ msgstr " nommé BUG-REPORT.TXT.\n"
#~ msgid ""
#~ " If <mrl> is given, xine will play the "
#~ "mrl\n"
#~ msgstr ""
-#~ " Si <mrl> est precisé, xine jouera cette "
+#~ " Si <mrl> est precisé, xine jouera cette "
#~ "mrl\n"
#~ msgid " then quit (like -pq).\n"
@@ -3001,16 +2994,16 @@
#~ msgstr " XShmQueryVersion: %d.%d.\n"
#~ msgid "sigprocmask() failed.\n"
-#~ msgstr "sigprocmask() a échoué.\n"
+#~ msgstr "sigprocmask() a échoué.\n"
#~ msgid "xine video output"
-#~ msgstr "sortie vidéo de xine"
+#~ msgstr "sortie vidéo de xine"
#~ msgid "Stream/OSD Information"
#~ msgstr "FLux/Information OSD"
#~ msgid "Stream/Window Information..."
-#~ msgstr "Flux/Fenêtre d'Information..."
+#~ msgstr "Flux/Fenêtre d'Information..."
#~ msgid "README"
#~ msgstr "Lisez-Moi"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xine-ui/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 13 Mar 2014 14:31:24 -0000 1.3
+++ .cvsignore 25 Mar 2014 16:49:26 -0000 1.4
@@ -1 +1,31 @@
+Antares.tar.gz
+Bambino-Black.tar.gz
+Bambino-Blue.tar.gz
+Bambino-Green.tar.gz
+Bambino-Orange.tar.gz
+Bambino-Pink.tar.gz
+Bambino-Purple.tar.gz
+Bambino-White.tar.gz
+Bluton.tar.gz
+CelomaChrome.tar.gz
+CelomaGold.tar.gz
+CelomaMdk.tar.gz
+Centori.tar.gz
+Crystal.tar.gz
+Galaxy.tar.gz
+Keramic.tar.gz
+KeramicRH8.tar.gz
+OMS_legacy.tar.gz
+Polaris.tar.gz
+Sunset.tar.gz
+blackslim2.tar.gz
+caramel.tar.gz
+cloudy.tar.gz
+concept.tar.gz
+gudgreen.tar.gz
+lcd.tar.gz
+mp2k.tar.gz
+mplayer.tar.gz
+pitt.tar.gz
xine-ui-0.99.8.tar.xz
+xinium.tar.gz
Index: xine-ui.spec
===================================================================
RCS file: /cvs/free/rpms/xine-ui/devel/xine-ui.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xine-ui.spec 13 Mar 2014 14:31:24 -0000 1.3
+++ xine-ui.spec 25 Mar 2014 16:49:26 -0000 1.4
@@ -6,7 +6,7 @@
Summary: A skinned xlib-based gui for xine-lib
Name: xine-ui
Version: 0.99.8
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.xine-project.org/
@@ -25,9 +25,14 @@
# Patch to use UTF-8 documentation, BZ #512598
Patch1: xine-ui-0.99.5-utf8doc.patch
+# FR translation update
+# https://bugs.xine-project.org/show_bug.cgi?id=511
+Patch2: xine-ui-0.99.8-update_french_translation.patch
+# Fix crash on exit
+# http://anonscm.debian.org/hg/xine-lib/xine-ui/raw-rev/702c252f3200
+Patch3: xine-ui-0.99.8-fix_crash_on_exit.patch
-
-#o Sources for -skins. Ugh.
+# Sources for -skins.
Source1: http://xine-project.org/skins/Antares.tar.gz
Source2: http://xine-project.org/skins/Bambino-Black.tar.gz
Source3: http://xine-project.org/skins/Bambino-Blue.tar.gz
@@ -62,7 +67,8 @@
Source31: default.ogv
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Package was named xine in rpmfusion
+
+# Package used to be named xine
Provides: xine = %{version}-%{release}
Obsoletes: xine < %{version}-%{release}
@@ -85,35 +91,36 @@
BuildRequires: xorg-x11-proto-devel
BuildRequires: libjpeg-turbo-devel
-# Lirc-devel is not available on EPEL-5
-%if 0%{?rhel} == 0
+# lirc-devel is not available on EPEL-5
+%if 0%{?fedora} || 0%{?el6}
BuildRequires: lirc-devel
%endif
# For dir ownership
Requires: hicolor-icon-theme
-Requires: xine-lib
+#
Requires: xine-lib-extras
+
%description
xine-ui is the traditional, skinned GUI for xine-lib.
-# Skins
-
%package skins
Summary: Extra skins for xine-ui
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
-# Package in RPMFusion was named skine-skins
-Obsoletes: xine-skins
-%if 0%{?fedora}>10 || 0%{?rhel}>5
+# Package used to be named xine-skins
+Provides: xine-skins = %{version}-%{release}
+Obsoletes: xine-skins < %{version}-%{release}
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
BuildArch: noarch
%endif
%description skins
This package contains extra skins for xine-ui.
+
%package aaxine
Summary: ASCII art player for terminals
Group: Applications/Multimedia
@@ -123,6 +130,7 @@
%description aaxine
This package contains the ASCII art player for terminals like the vt100
+
%prep
# Setup xine
%setup0 -q
@@ -132,6 +140,8 @@
%setup -T -D
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
# By default aaxine dlopen()'s a nonversioned libX11.so, however in Fedora
# it's provided by libX11-devel => version the dlopen()
@@ -165,6 +175,7 @@
sed -i 's,default.avi,default.ogv,' src/xitk/actions.c
sed -i 's,default.avi,default.ogv,' misc/visuals/Makefile.in
+
%build
./autogen.sh noconfig
export LIRC_CFLAGS="-llirc_client"
@@ -173,6 +184,7 @@
# Set documentation directory
make %{?_smp_mflags}
+
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
@@ -234,6 +246,7 @@
%{_bindir}/xine
%{_bindir}/xine-remote
+%dir %{_datadir}/xine/
%dir %{_datadir}/xine/skins/
%{_datadir}/xine/skins/xinetic/
%{_datadir}/xine/skins/xine-ui_logo.png
@@ -262,7 +275,17 @@
%defattr(-,root,root,-)
%{_bindir}/aaxine
+
%changelog
+* Thu Mar 13 2014 Xavier Bachelot <xavier at bachelot.org> - 0.99.8-2
+- Fix xine-skins Obsoletes:/Provides:.
+- Remove explicit Requires: xine-lib.
+- Own %%{_datadir}/xine.
+- Fix conditionnal around BR: lirc-devel.
+- Spec cosmetic cleanup.
+- Add patch to update french translation.
+- Add patch to fix crash on exit.
+
* Wed Mar 12 2014 Xavier Bachelot <xavier at bachelot.org> - 0.99.8-1
- Update to 0.99.8.
- Remove spurious tabs in specfile.
More information about the rpmfusion-commits
mailing list