From 479a5ab87c5ba3c881b7a66b1ee14286f0df813a Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: May 18 2009 05:59:05 +0000 Subject: Import in Fedora --- diff --git a/sources b/sources index e69de29..dbef5e6 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +e643cd1fcad4d98a5ae4eb877ce5087b xine-ui-0.99.5.tar.gz diff --git a/xine-ui-0.99.5-shared-lirc.patch b/xine-ui-0.99.5-shared-lirc.patch new file mode 100644 index 0000000..06b2f9d --- /dev/null +++ b/xine-ui-0.99.5-shared-lirc.patch @@ -0,0 +1,62 @@ +--- xine-ui-0.99.5/m4/_xine.m4~ 2006-07-01 05:26:26.000000000 +0300 ++++ xine-ui-0.99.5/m4/_xine.m4 2007-07-13 17:29:54.000000000 +0300 +@@ -35,15 +35,7 @@ AC_DEFUN([AC_CHECK_LIRC], + [AC_CHECK_HEADER(lirc/lirc_client.h, true, have_lirc=no)], have_lirc=no) + if test "$have_lirc" = "yes"; then + +- if test x"$LIRC_PREFIX" != "x"; then +- lirc_libprefix="$LIRC_PREFIX/lib" +- LIRC_INCLUDE="-I$LIRC_PREFIX/include" +- fi +- for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do +- AC_CHECK_FILE(["$llirc/liblirc_client.a"], +- [LIRC_LIBS="$llirc/liblirc_client.a"] +- AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblir_client) installed]),,) +- done ++ AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]) + else + AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]); + fi +--- xine-ui-0.99.5/configure~ 2007-05-01 01:51:18.000000000 +0300 ++++ xine-ui-0.99.5/configure 2007-07-13 17:28:19.000000000 +0300 +@@ -14414,39 +14414,11 @@ fi + + if test "$have_lirc" = "yes"; then + +- if test x"$LIRC_PREFIX" != "x"; then +- lirc_libprefix="$LIRC_PREFIX/lib" +- LIRC_INCLUDE="-I$LIRC_PREFIX/include" +- fi +- for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do +- as_ac_File=`echo "ac_cv_file_"$llirc/liblirc_client.a"" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for \"$llirc/liblirc_client.a\"" >&5 +-echo $ECHO_N "checking for \"$llirc/liblirc_client.a\"... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_File+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- test "$cross_compiling" = yes && +- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +- { (exit 1); exit 1; }; } +-if test -r ""$llirc/liblirc_client.a""; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +-if test `eval echo '${'$as_ac_File'}'` = yes; then +- LIRC_LIBS="$llirc/liblirc_client.a" +- + cat >>confdefs.h <<\_ACEOF + #define HAVE_LIRC + _ACEOF + +-fi +- +- done ++ LIRC_LIBS=-llirc_client + else + echo "$as_me:$LINENO: result: *** LIRC client support not available, LIRC support will be disabled ***" >&5 + echo "${ECHO_T}*** LIRC client support not available, LIRC support will be disabled ***" >&6; diff --git a/xine-ui.spec b/xine-ui.spec new file mode 100644 index 0000000..edcd5da --- /dev/null +++ b/xine-ui.spec @@ -0,0 +1,340 @@ +# TODO, sometime: nvtvsimple + +Summary: A skinned xlib-based gui for xine-lib +Name: xine-ui +Version: 0.99.5 +Release: 10%{?dist} +License: GPLv2+ +Group: Applications/Multimedia +URL: http://www.xine-project.org/ +Source0: http://downloads.sourceforge.net/xine/xine-ui-%{version}.tar.gz +# Patch to enable linking to shared library version of lirc +Patch0: xine-ui-0.99.5-shared-lirc.patch + +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +# Package was named xine in rpmfusion +Provides: xine = %{version}-%{release} +Obsoletes: xine < %{version}-%{release} + +BuildRequires: aalib-devel >= 1.2.0 +BuildRequires: curl-devel >= 7.10.2 +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: libcaca-devel +BuildRequires: libpng-devel +BuildRequires: libtermcap-devel +BuildRequires: libXft-devel +BuildRequires: libXinerama-devel +BuildRequires: libXt-devel +BuildRequires: libXtst-devel +BuildRequires: libXv-devel +BuildRequires: libXxf86vm-devel +BuildRequires: lirc-devel +BuildRequires: readline-devel +BuildRequires: xine-lib-devel >= 1.1.0 +Conflicts: xine-skins <= 1.0 + +# For dir ownership +Requires: hicolor-icon-theme +# To make aaxine work +Requires: xine-lib-extras + +%description +xine-ui is the default GUI for xine-lib. + +%prep +%setup -q +# Backup time stamp +touch -r m4/_xine.m4 m4/_xine.m4.stamp +%patch0 -p1 +# and restore it +touch -r m4/_xine.m4.stamp m4/_xine.m4 + +# By default aaxine dlopen()'s a nonversioned libX11.so, however in Fedora +# it's provided by libX11-devel => version the dlopen() +libx11so=$(ls -1 %{_libdir}/libX11.so.? | tail -n 1) +if [ -n "$libx11so" -a -f "$libx11so" ] ; then + sed -i -e "s/\"libX11\\.so\"/\"$(basename $libx11so)\"/" src/aaui/main.c +fi + +touch -r configure.ac configure.ac.stamp +sed -i -e 's/LINUX_KD_HB/LINUX_KD_H/g;s|linux/kd\.hb|linux/kd.h|g' \ + config.h.in configure.ac configure +touch -r configure.ac.stamp configure.ac + +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/README_uk ; do + iconv -f koi8-r -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 + + +%build +%configure --disable-dependency-tracking --enable-vdr-keys --with-aalib +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL="install -p" +%find_lang 'xi\(ne-ui\|tk\)' + +desktop-file-install --remove-category="Application" \ + --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 + +# Remove documentation installed by make install +rm -rf %{buildroot}%{_docdir} + + +%clean +rm -rf %{buildroot} + + +%post +# Mime type +update-desktop-database &> /dev/null || : + +%postun +# Mime type +update-desktop-database &> /dev/null || : +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}/aaxine +%{_bindir}/cacaxine +%{_bindir}/fbxine +%{_bindir}/xine +%{_bindir}/xine-bugreport +%{_bindir}/xine-check +%{_bindir}/xine-remote +%{_datadir}/xine/ +%{_datadir}/applications/*xine.desktop +%{_datadir}/icons/hicolor/*x*/apps/xine.png +%{_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 + + +%changelog +* Sun May 17 2009 Jussi Lehtola - 0.99.6-10 +- Use desktop-install --remove-category instead of sed. + +* Sat May 16 2009 Jussi Lehtola - 0.99.5-9 +- More desktop file fixes. +- Fix aaxine by adding Requires: xine-lib-extras. + +* Fri May 15 2009 Jussi Lehtola - 0.99.5-8 +- Conserve time stamps. +- Drop unnecessary desktop file patch. +- Drop unnecessary versioning of dlopen'd libX11.so. +- Add mime type update and fix icon cache update. + +* Fri May 15 2009 Jussi Lehtola - 0.99.5-7 +- Fixes for inclusion into Fedora. + +* Sun Mar 29 2009 Thorsten Leemhuis - 0.99.5-6 +- rebuild for new F11 features + +* Wed Oct 29 2008 Thorsten Leemhuis - 0.99.5-5 +- rebuilt + +* Sun Oct 26 2008 Thorsten Leemhuis - 0.99.5-4 +- rebuilt + +* Mon Aug 04 2008 Thorsten Leemhuis - 0.99.5-1 +- 0.99.5, lots of patches made obsolete. +- Update icon cache and desktop database. +- Patch {aa,caca}xine to dlopen libX11.so.* instead of libX11.so at runtime. +- Patch to look for linux/kd.h instead of linux/kd.hb during build. +- Don't run autotools during build. + +* Thu Mar 01 2007 Thorsten Leemhuis - 0.99.4-11 +- rebuild for new curl + +* Tue Nov 7 2006 Ville Skyttä - 0.99.4-10 +- Re-enable VDR keys and patch, patched xine-lib not required (#1241). + +* Thu Nov 2 2006 Ville Skyttä - 0.99.4-9 +- Drop X-Livna and Application desktop entry categories. + +* Thu Nov 2 2006 Ville Skyttä - 0.99.4-8 +- Make VDR support optional, disabled by default, fixes #1238. + +* Thu Apr 20 2006 Dams - 0.99.4-7 +- Added patch8 to fix up buffer overflow describe in #926 + +* Thu Mar 09 2006 Andreas Bierfert +- switch to new release field + +* Tue Feb 28 2006 Andreas Bierfert +- add dist + +* Fri Jan 20 2006 Ville Skyttä - 0.99.4-0.lvn.6 +- %%langify non-English manpages, really convert all (and more docs) to UTF-8. +- Improve summary and description. + +* Tue Jan 3 2006 Ville Skyttä - 0.99.4-0.lvn.5 +- Adapt to modular X. +- Drop pre-FC5 workarounds and rpmbuild conditionals. + +* Thu Sep 29 2005 Ville Skyttä - 0.99.4-0.lvn.4 +- Clean up obsolete pre-FC3 stuff (LIRC and CACA now unconditionally enabled). +- Drop zero Epochs. + +* Thu Sep 15 2005 Ville Skyttä - 0:0.99.4-0.lvn.3 +- Apply sprintf, uifixups and xftfontsize patches from Alex Stewart/freshrpms. +- Fix fbxine crash when the tty mode can't be set (upstreamed). +- Fix fbxine usage message and options (upstreamed). +- Make vdr support conditional (default enabled), require vdr-patched xine-lib + if enabled, and build with it for FC4+. +- Build with gcc4 again on FC4+. + +* Sun Aug 14 2005 Ville Skyttä - 0:0.99.4-0.lvn.2 +- Sync VDR patch with vdr-xine-0.7.5 (just for tracking purposes, no changes). + +* Tue Aug 2 2005 Dams - 0:0.99.4-0.lvn.1 +- Updated to 0.99.4 +- Fixed files section +- Dropped patch5 +- Dropped patch3 + +* Sun Jul 10 2005 Ville Skyttä - 0:0.99.3-0.lvn.8 +- Build with compat-gcc-32 for FC4 ("--with gcc32") as a temporary workaround + for spurious directory creation attempts (#419) and possibly other issues. +- Use shared LIRC client libs, possibly enable LIRC support also on x86_64. +- Apply gcc4 menu crash fix, kudos for the patch to freshrpms.net and + Alex Stewart, this'll be handy when we try with gcc4 again (#467). +- Clean up obsolete pre-FC2 stuff. + +* Sat Jun 4 2005 Ville Skyttä - 0:0.99.3-0.lvn.7 +- Apply VDR support update patch from vdr-xine-0.7.4. + +* Sat May 28 2005 Thorsten Leemhuis - 0:0.99.3-0.lvn.6 +- Fix typo + +* Mon May 9 2005 Ville Skyttä - 0:0.99.3-0.lvn.5 +- Add support for CACA, rebuild with "--without caca" to disable (#380). + +* Sat Apr 30 2005 Dams - 0:0.99.3-0.lvn.4 +- Fixed gcc4 build + +* Wed Apr 13 2005 Dams - 0:0.99.3-0.lvn.3 +- Conditional lirc buildreq (default enabled) + +* Sat Jan 1 2005 Ville Skyttä - 0:0.99.3-0.lvn.2 +- Enable support for VDR interaction keys. +- Enable curl unconditionally. +- Build with dependency tracking disabled. + +* Wed Dec 29 2004 Dams - 0:0.99.3-0.lvn.1 +- Updated to 0.99.3 + +* Tue Jul 6 2004 Dams 0:0.99.2-0.lvn.2 +- Updated no-march/mcpu patch +- Updated mkinstalldirs patch + +* Mon Jul 5 2004 Dams 0:0.99.2-0.lvn.1 +- Updated to 0.99.2 + +* Sun Jun 13 2004 Dams 0:0.99.1-0.lvn.3 +- Updated desktop entry for HID compliance + +* Fri May 21 2004 Dams 0:0.99.1-0.lvn.2 +- Updated URL in Source0 + +* Sat Apr 17 2004 Dams 0:0.99.1-0.lvn.1 +- Updated to 0.99.1 + +* Thu Feb 26 2004 Dams 0:0.9.23-0.lvn.2 +- Updated xine-lib version requirement in build dependancy +- Hopefully fixed build for RH9 + +* Thu Dec 25 2003 Dams 0:0.9.23-0.lvn.1 +- s/fedora/livna/ + +* Thu Dec 25 2003 Dams 0:0.9.23-0.fdr.1 +- Updated patch for no march/mcpu from configure + +* Wed Dec 24 2003 Dams 0:0.9.23-0.fdr.1 +- Updated to 0.9.23 + +* Sun Sep 28 2003 Dams 0:0.9.22-0.fdr.4 +- Added patch to fix po/Makefile for servern2 build + +* Sun Aug 31 2003 Dams 0:0.9.22-0.fdr.3 +- Translated manpages iconv'ed into utf-8 encoding + +* Sat Aug 23 2003 Dams 0:0.9.22-0.fdr.2 +- Conflict with old xine-skins packages +- Removed lirc conditionnal build requirement +- Added conditionnal Build dependencies for curl +- Added missing libtool BuildRequires + +* Wed Aug 20 2003 Dams 0:0.9.22-0.fdr.2 +- No more -skins package +- No more url in Source0 + +* Fri Aug 8 2003 Dams 0:0.9.22-0.fdr.1 +- Updated to 0.9.22 + +* Tue Jul 15 2003 Dams 0:0.9.21-0.fdr.3 +- exporting SED=__sed seems to fix build to rh80 + +* Sun Jul 6 2003 Dams 0:0.9.21-0.fdr.2 +- Trying to avoid unowned directories +- Patch for configure not to set march/mcpu. +- Removed BuildArch. + +* Sat May 17 2003 Dams 0:0.9.21-0.fdr.1 +- Updated to 0.9.21 +- buildroot -> RPM_BUILD_ROOT +- Updated URL in Source0 +- Updated BuildRequires + +* Sat Apr 12 2003 Dams 0:0.9.20-0.fdr.5 +- Arch stuff + +* Wed Apr 9 2003 Dams 0:0.9.20-0.fdr.4 +- Fixed typo +- Rebuild, linked against xine-lib 1 beta10 + +* Mon Apr 7 2003 Dams 0:0.9.20-0.fdr.3 +- Only one find_lang + +* Mon Apr 7 2003 Dams 0:0.9.20-0.fdr.2 +- Added BuildRequires. +- Added --with directives. +- Added use of desktop-file-install +- Added more Requires tag. + +* Thu Apr 3 2003 Dams +- Initial build.