diff --git a/.gitignore b/.gitignore index 727aac8..8ab2804 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ xinium.tar.gz xine-ui-0.99.6.tar.bz2 default.ogv /xine-ui-0.99.7.tar.xz +/xine-ui-0.99.14.tar.xz diff --git a/make_xineui_snapshot.sh b/make_xineui_snapshot.sh new file mode 100644 index 0000000..6162066 --- /dev/null +++ b/make_xineui_snapshot.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# This script is intended to make a xine-ui snapshot. +# If no argument is provided, it will make a snapshot of HEAD. +# If the svn revision is provided as an argument, it will make a snapshot of +# this revision. + +TMPDIR=$(mktemp -d) +pushd "$TMPDIR" || exit +echo -n "Cloning xine-ui " +[ -n "$1" ] && echo "revision $1" || echo "HEAD" +[ -n "$1" ] && OPT="-u $1 " || OPT="" +hg clone $OPT http://hg.code.sf.net/p/xine/xine-ui xine-ui +cd xine-ui || exit +autoreconf -vif +./configure +make dist +popd || exit +cp -p "$TMPDIR"/xine-ui/xine-ui-*.tar.xz . +rm -rf "$TMPDIR" diff --git a/sources b/sources index 319cd00..ab71549 100644 --- a/sources +++ b/sources @@ -1,32 +1,32 @@ -ad74c35558588f5d4234449a076b4105 Antares.tar.gz -61cbcf4cb3f1443a17e96c0a73eeb3a8 Bambino-Black.tar.gz -56f21a3ffddf0f0980336a5d9cdff179 Bambino-Blue.tar.gz -4d4ee2d1825896ff6c1dadfbf1f75864 Bambino-Green.tar.gz -dacd886be4fd9c13dd96fa3b96f3e7f8 Bambino-Orange.tar.gz -424b4dd516569c92af7d96c10daa46d3 Bambino-Pink.tar.gz -2e6438459244104e46d89a66e5a1f961 Bambino-Purple.tar.gz -3e8bc6f6958e8d732b88f2e227f3c879 Bambino-White.tar.gz -454bdc7321fc18f0db811db722c2e93c blackslim2.tar.gz -070fd8e3582b6f9e302b595c81dd87e4 Bluton.tar.gz -1ff0ea8d7c73c4f3b32c13a408af3be1 caramel.tar.gz -159b45f013183aea3038f9133f61cf89 CelomaChrome.tar.gz -5ac74cb407b59b3487031a0564698e1f CelomaGold.tar.gz -dadb7b21b8e7e0c40ad7237c4f98906f CelomaMdk.tar.gz -06f2b0f6ceb9456bc26fae65f4f89a53 Centori.tar.gz -432e0d5135be09e03a69f363d3da94a0 cloudy.tar.gz -34d18380c1077cdf43a04797b2e06734 concept.tar.gz -eb511cd1217bc0c0bd3fa016698adebc Crystal.tar.gz -c7825e925434374a074c4acc46bcdd4f Galaxy.tar.gz -d809f2f3cce0eae966296e01ede8df00 gudgreen.tar.gz -bff16e879b75bd5a442c0c5c7dc22bcb KeramicRH8.tar.gz -0154a3eecbeb995865ead852fd5f6bb2 Keramic.tar.gz -f16d6a1a39b32473a901d9132c405196 lcd.tar.gz -841924c042ca70700a9d201bc7686e59 mp2k.tar.gz -3023e8dd6c12902c32b3d99e51fd0c1e mplayer.tar.gz -54b3e28494e1d89e041ceace7db32049 OMS_legacy.tar.gz -7dd4e9e50e0145142982b0537c36f50a pitt.tar.gz -b92dfe59cb5f7bbc495ed0be50c1c132 Polaris.tar.gz -8702d138eb61b7149118f91121fe846a Sunset.tar.gz -9ebf98f4434a9fc119f0282806ba9c32 xinium.tar.gz -7243540b71a3ba5ee1105b5d8af9cfc5 default.ogv -2af6fcc2ad6af6ba2e471497c5d140dc xine-ui-0.99.7.tar.xz +SHA512 (xine-ui-0.99.14.tar.xz) = e925e2f1d02c4eac4615f59c99dd95f1627617f2abb644c521cf015f795c66bf56386e7d414b528c1cf91bbdab53f46999104e992aecebbdcb62c230e6d989e7 +SHA512 (Antares.tar.gz) = 82c1a118e4a75c676c8f354f6281371abbf0507096701811db56e8af97041152c917826a9dffcc62bd74dfabce546b5b0008d2d1c131f24d3b04db7ff96958af +SHA512 (Bambino-Black.tar.gz) = b45ecb3911facb98668ff298f755cefa4a6eb339274888781068de4e3b0e770d4dc372b57040d1d78a5420a570b04785cbcc6551ddbd0a0cd3d345223f97cbb9 +SHA512 (Bambino-Blue.tar.gz) = 86c8c8263a745408fa3a5b8e652db0149c0ca7be918de1204cae8ced618370eeb00123af511c8f5f7545bac28775ae36fb1c31d4ae6201ef1985f08989cbb56f +SHA512 (Bambino-Green.tar.gz) = 876dd46a7b30fdcce2926d3615df42a1e134a8f4701265302fe536c9bd81e649ce6c4e3e5e0091539961ae0265dbf4ec682c006aabb611725262ffac44922e1d +SHA512 (Bambino-Orange.tar.gz) = 5bc39832dc202d64e060d728fc4435bc48d89f6a87084cce3af1c6ecd0f28d42e560852c9e98860b701eb46503f04f1494df16912e47f437f81cfbb15325fcb5 +SHA512 (Bambino-Pink.tar.gz) = 90c3aa538745664e43f14d9f343bebccedee7deb63e199baac5e763e5ddd8e15c349f28ec9de80888b63fe56ea25b6badc424f3acbdca8e6d617e42658b5b452 +SHA512 (Bambino-Purple.tar.gz) = 0ae3637f90690665ffda41040eb075e8423eeda9d5b04c79d073623c3eb1969281b0a9ce43dd2b1cedc92664fc82764b51160f84d3bc367c4e39a823e8fc5884 +SHA512 (Bambino-White.tar.gz) = 15326ded6d7f1f8e04f13c5f0c3b38aac7f5adb742988122fc6bba89fe9a56852910f268a9da1a1ec1704976099b13a0c0c6c62f7d009ad0dad51156d6440357 +SHA512 (blackslim2.tar.gz) = 3f2d5ca6ebd8da7a51eac9e4a56310614c09c83616597af5eed9c6a37cfe30be76ada4ed29e981f8438f88373a4b4037f90c0bc62e76d9f8dfdf15ffb974109c +SHA512 (Bluton.tar.gz) = bbecc0ec4a3b1da1d4a04d10a286498e759868c6d7e119591fb1d1d6182154ec2a10953adf5ec6038ca001cfa68766c356e0a3e058096204dddb9813d8707f5c +SHA512 (caramel.tar.gz) = 7e914f91be51bbae65eaf6606338ba5ec42af31a3f676dd26ffef45ca346b9e6c1216e3f8cef60240c4c916b46c38fcb94d51135cda1c4ee6cf4630202ac63cf +SHA512 (CelomaChrome.tar.gz) = b2d8c9400a4098ce9a6e188b3ee1e43f3124963ad52952ee5eb155acc8e925b6a537ab8aee3f276863e50e43a02cce81f82e8f261a912bb9145cfa3319d89bb1 +SHA512 (CelomaGold.tar.gz) = 4b9a2a6ecff30dab5da5b5f9a797a1ca79bd2e8a77647831def77b52c3139124275b9ea1577f73ebb56fc3825cb762a6dc1737bc527b1109fe7cbbc491a466ec +SHA512 (CelomaMdk.tar.gz) = 221e5b666d48d3318509434b967bd9ad2626a3eae582178773c634bf8564e0bd446bcd3a724fcc2a06187f37d2d6b9ed1af51bae1951ef112b194e155ec62259 +SHA512 (Centori.tar.gz) = b2a6641d3855f47bcf6790019fd94cfc9c5776a40ba62c1b9519e55bbce15b6d2f461df3ed939a07569fa73bead4f46e03498f9aca33c9d26d9b2b055184bf43 +SHA512 (cloudy.tar.gz) = 9d787b699691e06711e6c3372e06c8ae60aba49864c78b5f3770c6d7051185a53d22a4935dff3e90be7ae1e114dc0f237143c12ff5da89d044e51ee0366f3133 +SHA512 (concept.tar.gz) = 2a6471620428daaaf2319de0783c38ec681d363a8810cc1b999337206f5d5ec2f3c5be49105247418448b8785c342c3ede23a6e9880d1f5b7b48f4ba122325b2 +SHA512 (Crystal.tar.gz) = 34c761330312f1a0f24aaac715b857bec27a14b48f8bfd925121ac4f709318c0fc130a21a15765ed9493f6e815ecaa5ca23a9a4c3259a9135f44bb3718be9400 +SHA512 (Galaxy.tar.gz) = f4b1f427faf8cab91524b32aa4d5008b0321a584da59ab27da02f844b3fcaf3fbdb308d372ed698357c699443ba454b0ca26cec419bb037c64f08a1509f6e9f9 +SHA512 (gudgreen.tar.gz) = e1199254b39fe85de4e5ddc48e577625075e2891479a7a9b1327482de24f14d0ead3e4414f69feb0912c150bb23913cbd441439342e7765092a31d26d98df373 +SHA512 (KeramicRH8.tar.gz) = c6d7f5453caeadc4ef649c6171e71a2937ad22df4c5a9a1d36ee1e774c4069be6fa1786e6b2f7cc8319ef0117dec3d2bbcd8c8e5d05f8dcd9d3b9d562cd3ed41 +SHA512 (Keramic.tar.gz) = 5662a3e0e6b4bc77fe8a76a98d3733aa961db9e710ab2fc0e4cdc79fe0012f3123f99ee181694fbbe784b64689c6def600d5c983c9edccce3a873791fdbd357a +SHA512 (lcd.tar.gz) = 2c3339ce50dc72416bd225ae27a21d817db19535e996eaf69153e5530554f7c92368e3b552b27356e0c0baaaa39e31c6855b9fadd850121bdfd0a2459472874b +SHA512 (mp2k.tar.gz) = 57e0e3c66a312cd97591130497dda71def1053299dbfa192ffb7be901870e7217cbd76e9ece1a08503a9c02ae066737b2860604f53854b446aa8327eb98dbf2f +SHA512 (mplayer.tar.gz) = 9d330c4d8056db9fbe3a13c21a1b8ba60ce682dad370823a0a180eecad990adb028771d1987026f33f283ac0130af00a8be4e97b6fbafa154ec62df501de2a8b +SHA512 (OMS_legacy.tar.gz) = d6d1cb7ffc5ea2b6813dae7d00a84c129633294f8c9e84f905837e3adfc476223c1c84ef59a4aa14f7247502eab7dd4c376349e3cb6191384ad07e345b4ce2f2 +SHA512 (pitt.tar.gz) = d2a8db7d41b82db06cabeb18ed750242bf52621b579d77f657040b5c8a422888f9fa991a83f27681dd21143771fe7ac6d5decf414fa764d44e7299e7494eb3ae +SHA512 (Polaris.tar.gz) = 706f6234ed9cc14dc90b198ef31f6a7c0b75b14a2640f5d9c5ce966a18a67153fdfe27206d057d729151e91d61d2d7d1a023a21852fd348d8b8452aaaf0f987f +SHA512 (Sunset.tar.gz) = 138bb9eaf34b236374d7501f61499b42f70da106a339b9e56c2bb4ed5f6c8a8063de51d92947992fd93f0254cb91b362341b5a6b7306aa1833b601d704f3c370 +SHA512 (xinium.tar.gz) = 4e3527b3ee1976f895767d32d2af5d00f89fb931411cb9d84d9c41aadb55cee9e74b8e1eb019f53e3cd000ca922eef371c27accbdb3892360522d1be390ce7e2 +SHA512 (default.ogv) = 074f4c1023fc1866b0ee7181bb278de27840fc3fdf38c8fc1a544dca8b8b5a0cc542a168f17d15e481f5376345638993b182d0836e8123e9bdde4342a986733c diff --git a/xine-ui-0.99.13-utf8doc.patch b/xine-ui-0.99.13-utf8doc.patch new file mode 100644 index 0000000..71135a4 --- /dev/null +++ b/xine-ui-0.99.13-utf8doc.patch @@ -0,0 +1,12 @@ +diff -aur xine-ui-0.99.13.orig/src/xitk/help.c xine-ui-0.99.13/src/xitk/help.c +--- xine-ui-0.99.13.orig/src/xitk/help.c 2020-09-11 12:09:04.000000000 +0200 ++++ xine-ui-0.99.13/src/xitk/help.c 2020-09-12 22:43:57.534208610 +0200 +@@ -192,7 +192,7 @@ + help_add_section (help, locale_readme, lang->doc_encoding, order_num, section_name); + } + else { +- help_add_section (help, default_readme, "ISO-8859-1", order_num, section_name); ++ help_add_section (help, default_readme, "UTF-8", order_num, section_name); + } + } + } diff --git a/xine-ui-0.99.5-utf8doc.patch b/xine-ui-0.99.5-utf8doc.patch deleted file mode 100644 index e5a7047..0000000 --- a/xine-ui-0.99.5-utf8doc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urp xine-ui-0.99.5.orig/src/xitk/help.c xine-ui-0.99.5/src/xitk/help.c ---- xine-ui-0.99.5.orig/src/xitk/help.c 2009-07-19 18:27:09.000000000 +0100 -+++ xine-ui-0.99.5/src/xitk/help.c 2009-07-19 18:27:25.000000000 +0100 -@@ -182,7 +182,7 @@ static void help_sections(void) { - help_add_section(locale_readme, lang->doc_encoding, order_num, section_name); - } - else { -- help_add_section(default_readme, "ISO-8859-1", order_num, section_name); -+ help_add_section(default_readme, "UTF-8", order_num, section_name); - } - } - } diff --git a/xine-ui-configure-c99.patch b/xine-ui-configure-c99.patch new file mode 100644 index 0000000..d6399d8 --- /dev/null +++ b/xine-ui-configure-c99.patch @@ -0,0 +1,65 @@ +Fix C compatibility issues in the configure script + +This is necessary to avoid incorrectly failing probes due to expected +compiler errors. + +Include for the exit function, and for the +strdup function. + +Use fake prototypes to avoid implicit function declarations in the +xine_* function probes. + +Submitted upstream: + +diff -ur xine-ui-0.99.14.orig/configure.ac xine-ui-0.99.14/configure.ac +--- xine-ui-0.99.14.orig/configure.ac 2023-01-07 20:28:52.000000000 +0100 ++++ xine-ui-0.99.14/configure.ac 2023-12-19 08:23:25.368687930 +0100 +@@ -198,6 +198,7 @@ + if test "$ac_cv_header_sys_shm_h" = "yes"; then + AC_MSG_CHECKING(whether shmctl IPC_RMID allowes subsequent attaches) + AC_TRY_RUN([ ++ #include + #include + #include + #include +diff -ur xine-ui-0.99.14.orig/m4/aa.m4 xine-ui-0.99.14/m4/aa.m4 +--- xine-ui-0.99.14.orig/m4/aa.m4 2023-01-07 20:28:52.000000000 +0100 ++++ xine-ui-0.99.14/m4/aa.m4 2023-12-19 08:22:50.481984296 +0100 +@@ -52,6 +52,7 @@ + #include + #include + #include ++#include + + int main () { + int major, minor; +diff -ur xine-ui-0.99.14.orig/m4/_xine.m4 xine-ui-0.99.14/m4/_xine.m4 +--- xine-ui-0.99.14.orig/m4/_xine.m4 2023-01-07 20:28:52.000000000 +0100 ++++ xine-ui-0.99.14/m4/_xine.m4 2023-12-19 08:22:02.665390504 +0100 +@@ -218,7 +218,7 @@ + CFLAGS="$CFLAGS $XINE_CFLAGS" + LIBS="$LIBS $XINE_LIBS" + AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([],[xine_open_cloexec();])], ++ [AC_LANG_PROGRAM([char xine_open_cloexec(void);],[xine_open_cloexec();])], + [AC_DEFINE([HAVE_XINE_OPEN_CLOEXEC], [1], [Define if xine-lib supports xine_open_cloexec]) + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])]) +@@ -234,7 +234,7 @@ + CFLAGS="$CFLAGS $XINE_CFLAGS" + LIBS="$LIBS $XINE_LIBS" + AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([],[xine_socket_cloexec();])], ++ [AC_LANG_PROGRAM([char xine_socket_cloexec(void);],[xine_socket_cloexec();])], + [AC_DEFINE([HAVE_XINE_SOCKET_CLOEXEC], [1], [Define if xine-lib supports xine_socket_cloexec]) + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])]) +@@ -250,7 +250,7 @@ + CFLAGS="$CFLAGS $XINE_CFLAGS" + LIBS="$LIBS $XINE_LIBS" + AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([ ++ [AC_LANG_PROGRAM([char xine_list_next_value(void); + ],[ + xine_list_next_value (); + ])], diff --git a/xine-ui.spec b/xine-ui.spec index 48e5702..31046bf 100644 --- a/xine-ui.spec +++ b/xine-ui.spec @@ -1,78 +1,74 @@ -# TODO, sometime: nvtvsimple +#global snapshot 1 +#global date 20250317 +#global commit 7e63ae -# hg version -# %global hgdate 20091217 - -Summary: A skinned xlib-based gui for xine-lib Name: xine-ui -Version: 0.99.7 -Release: 8%{?dist} -License: GPLv2+ -Group: Applications/Multimedia +Version: 0.99.14 +Release: 14%{?snapshot:.%{date}hg%{commit}}%{?dist} +Summary: A skinned xlib-based gui for xine-lib +License: GPL-2.0-or-later URL: http://www.xine-project.org/ - +%if ! 0%{?snapshot} Source0: http://sourceforge.net/projects/xine/files/xine-ui/%{version}/xine-ui-%{version}.tar.xz +%else +Source0: xine-ui-%{version}hg.tar.xz +%endif -#Use source from hg for now to fix a few bugs -#This tarball has been created with -# hg clone http://hg.debian.org/hg/xine-lib/xine-ui/ xine-ui-0.99.6 -# find xine-ui-0.99.6 -name .hg* -exec rm -rf {} \; -# find xine-ui-0.99.6 -name .cvs* -exec rm -rf {} \; -# tar jcf xine-ui-0.99.6-20091217.tar.bz2 xine-ui-0.99.6/ -# Source0: xine-ui-%{version}-%{hgdate}.tar.bz2 -BuildRequires: autoconf -BuildRequires: automake +# Sources for -skins. +Source1: https://xine.sourceforge.net/skins/Antares.tar.gz +Source2: https://xine.sourceforge.net/skins/Bambino-Black.tar.gz +Source3: https://xine.sourceforge.net/skins/Bambino-Blue.tar.gz +Source4: https://xine.sourceforge.net/skins/Bambino-Green.tar.gz +Source5: https://xine.sourceforge.net/skins/Bambino-Orange.tar.gz +Source6: https://xine.sourceforge.net/skins/Bambino-Pink.tar.gz +Source7: https://xine.sourceforge.net/skins/Bambino-Purple.tar.gz +Source8: https://xine.sourceforge.net/skins/Bambino-White.tar.gz +Source9: https://xine.sourceforge.net/skins/blackslim2.tar.gz +Source10: https://xine.sourceforge.net/skins/Bluton.tar.gz +Source11: https://xine.sourceforge.net/skins/caramel.tar.gz +Source12: https://xine.sourceforge.net/skins/CelomaChrome.tar.gz +Source13: https://xine.sourceforge.net/skins/CelomaGold.tar.gz +Source14: https://xine.sourceforge.net/skins/CelomaMdk.tar.gz +Source15: https://xine.sourceforge.net/skins/Centori.tar.gz +Source16: https://xine.sourceforge.net/skins/cloudy.tar.gz +Source17: https://xine.sourceforge.net/skins/concept.tar.gz +Source18: https://xine.sourceforge.net/skins/Crystal.tar.gz +Source19: https://xine.sourceforge.net/skins/Galaxy.tar.gz +Source20: https://xine.sourceforge.net/skins/gudgreen.tar.gz +Source21: https://xine.sourceforge.net/skins/KeramicRH8.tar.gz +Source22: https://xine.sourceforge.net/skins/Keramic.tar.gz +Source23: https://xine.sourceforge.net/skins/lcd.tar.gz +Source24: https://xine.sourceforge.net/skins/mp2k.tar.gz +Source25: https://xine.sourceforge.net/skins/mplayer.tar.gz +Source26: https://xine.sourceforge.net/skins/OMS_legacy.tar.gz +Source27: https://xine.sourceforge.net/skins/pitt.tar.gz +Source28: https://xine.sourceforge.net/skins/Polaris.tar.gz +Source29: https://xine.sourceforge.net/skins/Sunset.tar.gz +Source30: https://xine.sourceforge.net/skins/xinium.tar.gz +Source31: default.ogv + +# AppStream data +Source90: xine.appdata.xml + +# Script to make a xine-ui snapshot +Source100: make_xineui_snapshot.sh # Patch to use UTF-8 documentation, BZ #512598 -Patch1: xine-ui-0.99.5-utf8doc.patch +Patch1: xine-ui-0.99.13-utf8doc.patch - -#o Sources for -skins. Ugh. -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 -Source4: http://xine-project.org/skins/Bambino-Green.tar.gz -Source5: http://xine-project.org/skins/Bambino-Orange.tar.gz -Source6: http://xine-project.org/skins/Bambino-Pink.tar.gz -Source7: http://xine-project.org/skins/Bambino-Purple.tar.gz -Source8: http://xine-project.org/skins/Bambino-White.tar.gz -Source9: http://xine-project.org/skins/blackslim2.tar.gz -Source10: http://xine-project.org/skins/Bluton.tar.gz -Source11: http://xine-project.org/skins/caramel.tar.gz -Source12: http://xine-project.org/skins/CelomaChrome.tar.gz -Source13: http://xine-project.org/skins/CelomaGold.tar.gz -Source14: http://xine-project.org/skins/CelomaMdk.tar.gz -Source15: http://xine-project.org/skins/Centori.tar.gz -Source16: http://xine-project.org/skins/cloudy.tar.gz -Source17: http://xine-project.org/skins/concept.tar.gz -Source18: http://xine-project.org/skins/Crystal.tar.gz -Source19: http://xine-project.org/skins/Galaxy.tar.gz -Source20: http://xine-project.org/skins/gudgreen.tar.gz -Source21: http://xine-project.org/skins/KeramicRH8.tar.gz -Source22: http://xine-project.org/skins/Keramic.tar.gz -Source23: http://xine-project.org/skins/lcd.tar.gz -Source24: http://xine-project.org/skins/mp2k.tar.gz -Source25: http://xine-project.org/skins/mplayer.tar.gz -Source26: http://xine-project.org/skins/OMS_legacy.tar.gz -Source27: http://xine-project.org/skins/pitt.tar.gz -Source28: http://xine-project.org/skins/Polaris.tar.gz -Source29: http://xine-project.org/skins/Sunset.tar.gz -Source30: http://xine-project.org/skins/xinium.tar.gz - -Source31: default.ogv - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# Package was named xine in rpmfusion -Provides: xine = %{version}-%{release} -Obsoletes: xine < %{version}-%{release} +Patch2: xine-ui-configure-c99.patch BuildRequires: aalib-devel >= 1.2.0 +BuildRequires: autoconf +BuildRequires: automake BuildRequires: curl-devel >= 7.10.2 BuildRequires: desktop-file-utils +BuildRequires: gcc BuildRequires: gettext +BuildRequires: libappstream-glib BuildRequires: libcaca-devel +BuildRequires: libjpeg-turbo-devel BuildRequires: libpng-devel >= 1.5 -BuildRequires: libtermcap-devel BuildRequires: libXft-devel BuildRequires: libXi-devel BuildRequires: libXinerama-devel @@ -80,58 +76,68 @@ BuildRequires: libXt-devel BuildRequires: libXtst-devel BuildRequires: libXv-devel BuildRequires: libXxf86vm-devel +%{!?_without_lirc:BuildRequires: lirc-devel} +BuildRequires: ncurses-devel BuildRequires: readline-devel BuildRequires: xine-lib-devel >= 1.1.0 BuildRequires: xorg-x11-proto-devel -BuildRequires: libjpeg-turbo-devel - -# Lirc-devel is not available on EPEL-5 -%if 0%{?rhel} == 0 -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 BuildArch: noarch -%endif %description skins This package contains extra skins for xine-ui. + %package aaxine -Summary: ASCII art player for terminals -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -Requires: xine-lib-extras +Summary: ASCII art player for terminals +Requires: %{name} = %{version}-%{release} +Requires: xine-lib-extras %description aaxine -This package contains the ASCII art player for terminals like the vt100 +This package contains the ASCII art player for terminals like the vt100. +It also contains the color ascii art and framebuffer versions. + %prep # Setup xine -%setup0 -q +%setup -q -n %{name}-%{version}%{?snapshot:hg} # Setup skins -%setup1 -T -q -c -n %{name}-%{version}/fedoraskins -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 +%setup -T -q -c -n %{name}-%{version}%{?snapshot:hg}/fedoraskins -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 # Restore directory -%setup -T -D +%setup -T -D -n %{name}-%{version}%{?snapshot:hg} -%patch1 -p1 +%if ! 0%{?snapshot} +%patch -P1 -p1 +%patch -P2 -p1 + +# assure use of system getopt +rm -f src/common/getopt.{c,h} + +# Fix file encoding +for f in doc/man/{de,es,fr}/*.1* ; do + iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 && \ + touch -r $f $f.utf8 && \ + mv $f.utf8 $f +done +for f in doc/man/pl/*.1* src/xitk/xine-toolkit/README ; do + iconv -f iso-8859-2 -t utf-8 $f > $f.utf8 && \ + touch -r $f $f.utf8 && \ + mv $f.utf8 $f +done +%endif # By default aaxine dlopen()'s a nonversioned libX11.so, however in Fedora # it's provided by libX11-devel => version the dlopen() @@ -140,133 +146,251 @@ if [ -n "$libx11so" -a -f "$libx11so" ] ; then sed -i -e "s/\"libX11\\.so\"/\"$(basename $libx11so)\"/" src/aaui/main.c fi -for f in doc/man/{de,es,fr}/*.1* doc/README?{cs,de,es,fi,fr,it} ; do - iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 && \ - touch -r $f $f.utf8 && \ - mv $f.utf8 $f -done -for f in doc/man/pl/*.1* doc/README?{cs,pl}* ; do - iconv -f iso-8859-2 -t utf-8 $f > $f.utf8 && \ - touch -r $f $f.utf8 && \ - mv $f.utf8 $f -done -for f in src/xitk/xine-toolkit/README ; do - iconv -f iso-8859-2 -t utf-8 $f > $f.utf8 && \ - touch -r $f $f.utf8 && \ - mv $f.utf8 $f -done - cp -a src/xitk/xine-toolkit/README doc/README.xitk -# Clean out skins -find fedoraskins/ -type d -name "CVS" -exec rm -rf {} \; || : -find fedoraskins/ -type d -name ".xvpics" -exec rm -rf {} \; || : - -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 +%if 0%{!?_without_lirc} export LIRC_CFLAGS="-llirc_client" export LIRC_LIBS="-llirc_client" -#%configure --disable-dependency-tracking --enable-vdr-keys --with-aalib XINE_DOCPATH=%{_docdir}/%{name}-%{version} -# Set documentation directory -make %{?_smp_mflags} +%endif +export XINE_DOCPATH=%{_docdir}/%{name}-%{version} +%configure --disable-dependency-tracking \ + --enable-vdr-keys \ + --with-aalib +%make_build + %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} INSTALL="install -p" +%make_install %find_lang 'xi\(ne-ui\|tk\)' desktop-file-install --remove-category="Application" --vendor="" \ --add-category="Audio" --add-category="Video" \ --dir %{buildroot}%{_datadir}/applications misc/desktops/xine.desktop -# Remove the desktop file installed in the wrong place -rm -rf %{buildroot}%{_datadir}/xine/desktop +install -D -m0644 %{SOURCE90} %{buildroot}%{_metainfodir}/xine.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/xine.appdata.xml -# Remove the default avi. Gets replaced with default.ogv -rm -rf %{buildroot}%{_datadir}/xine/visuals/default.avi - -# Remove automatically installed documentation (listed in %doc) +# Remove automatically installed documentation (listed in %%doc) rm -rf %{buildroot}%{_docdir}/ # Remove misdesigned xine-check rm -f %{buildroot}%{_bindir}/xine-bugreport -rm -f %{buildroot}%{_mandir}/xine-bugreport.* +rm -f %{buildroot}%{_mandir}/*/man1/xine-bugreport.* +rm -f %{buildroot}%{_mandir}/man1/xine-bugreport.* rm -f %{buildroot}%{_bindir}/xine-check -rm -f %{buildroot}%{_mandir}/xine-check.* +rm -f %{buildroot}%{_mandir}/*/man1/xine-check.* +rm -f %{buildroot}%{_mandir}/man1/xine-check.* # Install extra skins cp -a fedoraskins/* %{buildroot}%{_datadir}/xine/skins/ -%clean -rm -rf %{buildroot} - - -%post -# Mime type -update-desktop-database &> /dev/null || : -update-mime-database %{_datadir}/mime &> /dev/null || : -# Icon cache -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -# Mime type -update-desktop-database &> /dev/null || : -update-mime-database %{_datadir}/mime &> /dev/null || : -# Icon cache -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - %files -f 'xi\(ne-ui\|tk\)'.lang -%defattr(-,root,root,-) -%doc doc/README* -%{_bindir}/cacaxine -%{_bindir}/fbxine +%license COPYING +%doc ChangeLog doc/README* %{_bindir}/xine %{_bindir}/xine-remote - +%dir %{_datadir}/xine/ %dir %{_datadir}/xine/skins/ %{_datadir}/xine/skins/xinetic/ -%{_datadir}/xine/skins/xine-ui_logo.png +%{_datadir}/xine/skins/missing.png +%{_datadir}/xine/skins/xine_64.png %{_datadir}/xine/skins/xine_splash.png +%{_datadir}/xine/skins/xine-ui_logo.mpg +%{_datadir}/xine/skins/xine-ui_logo.png %{_datadir}/xine/oxine/ %{_datadir}/xine/visuals/ - %{_datadir}/mime/packages/xine-ui.xml %{_datadir}/applications/*xine.desktop %{_datadir}/icons/hicolor/*x*/apps/xine.png +%{_datadir}/icons/hicolor/scalable/apps/xine.svgz %{_datadir}/pixmaps/xine.xpm -%{_mandir}/man1/*.1.gz -%lang(de) %{_mandir}/de/man1/*.1.gz -%lang(es) %{_mandir}/es/man1/*.1.gz -%lang(fr) %{_mandir}/fr/man1/*.1.gz -%lang(pl) %{_mandir}/pl/man1/*.1.gz +%{_datadir}/pixmaps/xine_32.xpm +%{_mandir}/man1/xine* +%{_metainfodir}/xine.appdata.xml +%lang(de) %{_mandir}/de/man1/xine* +%lang(es) %{_mandir}/es/man1/xine* +%lang(fr) %{_mandir}/fr/man1/xine* +%lang(nl) %{_mandir}/nl/man1/xine* +%lang(pl) %{_mandir}/pl/man1/xine* %files skins -%defattr(-,root,root,-) %{_datadir}/xine/skins/* %exclude %{_datadir}/xine/skins/xinetic/ -%exclude %{_datadir}/xine/skins/xine-ui_logo.png +%exclude %{_datadir}/xine/skins/missing.png +%exclude %{_datadir}/xine/skins/xine_64.png %exclude %{_datadir}/xine/skins/xine_splash.png +%exclude %{_datadir}/xine/skins/xine-ui_logo.mpg +%exclude %{_datadir}/xine/skins/xine-ui_logo.png %files aaxine -%defattr(-,root,root,-) %{_bindir}/aaxine +%{_bindir}/cacaxine +%{_bindir}/fbxine +%{_mandir}/man1/aaxine* +%lang(de) %{_mandir}/de/man1/aaxine* +%lang(es) %{_mandir}/es/man1/aaxine* +%lang(nl) %{_mandir}/nl/man1/aaxine* +%lang(pl) %{_mandir}/pl/man1/aaxine* + %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.99.14-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Wed Jun 25 2025 Xavier Bachelot - 0.99.14-13 +- Re-enable lirc for EL10 + +* Tue Mar 18 2025 Xavier Bachelot - 0.99.14-12 +- Add fix for GCC15 issue (RHBZ#2341570) + +* Sun Jan 19 2025 Fedora Release Engineering - 0.99.14-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Dec 20 2024 Xavier Bachelot - 0.99.14-10 +- Disable lirc support for EL10 + +* Tue Jul 30 2024 Xavier Bachelot - 0.99.14-9 +- Fix build with rpm >= 4.20 (RHBZ#2301375) +- Drop EL7-only scriptlets + +* Sat Jul 20 2024 Fedora Release Engineering - 0.99.14-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu May 09 2024 Yaakov Selkowitz - 0.99.14-7 +- Add AppStream metadata + +* Sat Jan 27 2024 Fedora Release Engineering - 0.99.14-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Dec 19 2023 Florian Weimer - 0.99.14-5 +- Fix C compatibility issues in the configure script + +* Sat Jul 22 2023 Fedora Release Engineering - 0.99.14-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Mar 08 2023 Xavier Bachelot - 0.99.14-3 +- Fix skins URLs + +* Wed Mar 08 2023 Xavier Bachelot - 0.99.14-2 +- Use SPDX License: tag +- Drop useless conditionals +- Drop useless comments +- Add EL7 cond for %%post/%%postun +- Escape unescaped %% in %%changelog +- Drop very old Obsoletes:/Provides: for xine/xine-skins + +* Sat Jan 07 2023 Xavier Bachelot - 0.99.14-1 +- Update to 0.99.14 +- Enable lirc and libcaca for EL9 + +* Mon Aug 08 2022 RPM Fusion Release Engineering - 0.99.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg + 5.1 + +* Tue Mar 08 2022 Xavier Bachelot - 0.99.13-4 +- Add support for EL9 + +* Wed Feb 09 2022 RPM Fusion Release Engineering - 0.99.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Dec 17 2021 Xavier Bachelot - 0.99.13-2 +- Fix build on armv7hl, ppc64le and aarch64 +- Fix build with libcaca >= 0.99.beta20 + +* Mon Dec 13 2021 Xavier Bachelot - 0.99.13-1 +- Update to 0.99.13 + +* Tue Aug 03 2021 RPM Fusion Release Engineering - 0.99.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Feb 04 2021 RPM Fusion Release Engineering - 0.99.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Aug 19 2020 RPM Fusion Release Engineering - 0.99.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Feb 05 2020 RPM Fusion Release Engineering - 0.99.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Dec 10 2019 Xavier Bachelot - 0.99.12-1 +- Update to 0.99.12. +- Drop now unneeded logo tweaks. +- Re-enable lirc support for EL8. +- Conditionalize snippets needed only for older than EL8 releases. +- Clean up file encoding fix. +- Fix obsolete BR: libtermcap-devel, BR: ncurses-devel instead. + +* Sat Aug 24 2019 Xavier Bachelot - 0.99.11-1.20190824hg894d90 +- Update to 0.99.11. +- Move cacaxine and fbxine to aaxine subpackage. +- Allow to build from snapshot. +- Use %%make_build and %%make_install. +- Re-order specfile preamble. +- Disable lirc support for EL8. + +* Fri Aug 09 2019 RPM Fusion Release Engineering - 0.99.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Mar 05 2019 RPM Fusion Release Engineering - 0.99.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Aug 19 2018 Leigh Scott - 0.99.10-5 +- Rebuilt for Fedora 29 Mass Rebuild binutils issue + +* Fri Jul 27 2018 RPM Fusion Release Engineering - 0.99.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jul 20 2018 Xavier Bachelot - 0.99.10-3 +- Add BR: gcc. + +* Thu Mar 01 2018 RPM Fusion Release Engineering - 0.99.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Dec 31 2017 Xavier Bachelot - 0.99.10-1 +- Update to 0.99.10. +- Drop obsolete conditionals. +- Drop Group: tags. +- Add %%license and Changelog to %%doc. + +* Thu Aug 31 2017 RPM Fusion Release Engineering - 0.99.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Mar 21 2017 RPM Fusion Release Engineering - 0.99.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Jan 07 2017 Xavier Bachelot - 0.99.9-3 +- Fix conditional BR on lirc-devel for EL7. + +* Thu Oct 20 2016 Leigh Scott - 0.99.9-2 +- Fix man files (rfbz#4297) + +* Fri Aug 22 2014 Xavier Bachelot - 0.99.9-1 +- Update to 0.99.9. +- Modernize specfile. + +* Thu Mar 13 2014 Xavier Bachelot - 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 - 0.99.8-1 +- Update to 0.99.8. +- Remove spurious tabs in specfile. + +* Wed Oct 23 2013 Xavier Bachelot - 0.99.7-9 +- Rebuild for xine-lib 1.2. + * Sun Aug 04 2013 Fedora Release Engineering - 0.99.7-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - * Mon Mar 11 2013 Michael J Gruber 0.99.7-7 - remove xine-check because it requires bits from the devel package diff --git a/xine.appdata.xml b/xine.appdata.xml new file mode 100644 index 0000000..2018475 --- /dev/null +++ b/xine.appdata.xml @@ -0,0 +1,32 @@ + + + net.sourceforge.xine + CC0-1.0 + GPL-2.0-or-later + Xine + Multimedia player + +

+ Xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. + It also decodes multimedia files like AVI, MOV, WMV, and MP3 from + local disk drives, and displays multimedia streamed over the Internet. + It interprets many of the most common multimedia formats available, + and some of the most uncommon formats, too. +

+ + xine.desktop + + + + + + Xinetic skin + https://xine.sourceforge.net/images/news/capture6.png + + + https://xine.sourceforge.net/ + https://sourceforge.net/p/xine/tickets/ + https://xine.sourceforge.net/donations + https://xine.sourceforge.net/faq + +