From 6296ad9f5dfb2c4d15ce71cb33538872ef76538e Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 13 Apr 2003 12:42:57 +0000 Subject: [PATCH] - removed obsolete patches: DESTDIR,ac_am,dfb,no_corba - new patches: nolibs (remove -lnsl), opt (don't override our flags with -O3) - aalib-progs no longer needed (aalib-config used instead of aainfo) - removed wrong _mandir definition Changed files: xine-ui-DESTDIR.patch -> 1.2 xine-ui-ac_am.patch -> 1.3 xine-ui-dfb.patch -> 1.3 xine-ui-no_corba.patch -> 1.2 xine-ui-nolibs.patch -> 1.1 xine-ui-opt.patch -> 1.1 xine-ui.spec -> 1.56 --- xine-ui-DESTDIR.patch | 20 ---------- xine-ui-ac_am.patch | 11 ------ xine-ui-dfb.patch | 11 ------ xine-ui-no_corba.patch | 21 ----------- xine-ui-nolibs.patch | 13 +++++++ xine-ui-opt.patch | 83 ++++++++++++++++++++++++++++++++++++++++++ xine-ui.spec | 47 ++++++++++-------------- 7 files changed, 115 insertions(+), 91 deletions(-) delete mode 100644 xine-ui-DESTDIR.patch delete mode 100644 xine-ui-ac_am.patch delete mode 100644 xine-ui-dfb.patch delete mode 100644 xine-ui-no_corba.patch create mode 100644 xine-ui-nolibs.patch create mode 100644 xine-ui-opt.patch diff --git a/xine-ui-DESTDIR.patch b/xine-ui-DESTDIR.patch deleted file mode 100644 index 8dc8cc3..0000000 --- a/xine-ui-DESTDIR.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- xine-ui-0.9.7/src/xitk/skins/Makefile.am~ Mon Nov 26 19:37:54 2001 -+++ xine-ui-0.9.7/src/xitk/skins/Makefile.am Sun Dec 23 20:31:00 2001 -@@ -1,12 +1,12 @@ - SUBDIRS = lcd pitt xinetic - - install-exec-am: -- if test -d @XINE_SKINDIR@/metal; then \ -- rm -rf @XINE_SKINDIR@/metal; \ -+ if test -d $(DESTDIR)@XINE_SKINDIR@/metal; then \ -+ rm -rf $(DESTDIR)@XINE_SKINDIR@/metal; \ - fi -- if test -d @XINE_SKINDIR@/default; then \ -- rm -rf @XINE_SKINDIR@/default && \ -- $(LN_S) @XINE_SKINDIR@/xinetic @XINE_SKINDIR@/default; \ -+ if test -d $(DESTDIR)@XINE_SKINDIR@/default; then \ -+ rm -rf $(DESTDIR)@XINE_SKINDIR@/default && \ -+ $(LN_S) $(DESTDIR)@XINE_SKINDIR@/xinetic $(DESTDIR)@XINE_SKINDIR@/default; \ - fi - - debug: diff --git a/xine-ui-ac_am.patch b/xine-ui-ac_am.patch deleted file mode 100644 index 8f07f48..0000000 --- a/xine-ui-ac_am.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xine-ui-0.9.13/configure.in.orig Sat Aug 3 21:30:17 2002 -+++ xine-ui-0.9.13/configure.in Tue Oct 1 13:53:19 2002 -@@ -106,7 +106,7 @@ - AC_C_INLINE - AC_TYPE_OFF_T - AC_TYPE_SIZE_T --dnl AM_TYPE_PTRDIFF_T -+AC_CHECK_TYPES(ptrdiff_t) - dnl AC_C_BIGENDIAN - - AC_SUBST(DEBUG_CFLAGS) diff --git a/xine-ui-dfb.patch b/xine-ui-dfb.patch deleted file mode 100644 index 1c8141e..0000000 --- a/xine-ui-dfb.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xine-ui-0.9.13/src/dfb/Makefile.am.orig Tue Oct 1 15:06:19 2002 -+++ xine-ui-0.9.13/src/dfb/Makefile.am Tue Oct 1 15:05:39 2002 -@@ -19,7 +19,7 @@ - bin_PROGRAMS = ${dfb_programs} - - if HAVE_DIRECTFB --datadir = $(XINE_SKINDIR)/../fonts/ -+#datadir = $(XINE_SKINDIR)/../fonts/ - data_DATA = $(fontandpointers) - endif - diff --git a/xine-ui-no_corba.patch b/xine-ui-no_corba.patch deleted file mode 100644 index 9b30e8d..0000000 --- a/xine-ui-no_corba.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -durN xine-ui-0.9.12.orig/configure.in xine-ui-0.9.12/configure.in ---- xine-ui-0.9.12.orig/configure.in Sun Jun 23 15:46:04 2002 -+++ xine-ui-0.9.12/configure.in Sun Jun 23 15:48:18 2002 -@@ -697,7 +697,6 @@ - readline/Makefile - src/Makefile - src/common/Makefile --src/corba/Makefile - src/Imlib-light/Makefile - src/xitk/Makefile - src/xitk/xine-toolkit/Makefile -diff -durN xine-ui-0.9.12.orig/src/Makefile.am xine-ui-0.9.12/src/Makefile.am ---- xine-ui-0.9.12.orig/src/Makefile.am Sat Feb 2 22:12:35 2002 -+++ xine-ui-0.9.12/src/Makefile.am Sun Jun 23 15:48:07 2002 -@@ -1,5 +1,5 @@ - --SUBDIRS = common Imlib-light corba xitk aaui dfb -+SUBDIRS = common Imlib-light xitk aaui dfb - - debug: - @list='$(SUBDIRS)'; for subdir in $$list; do \ diff --git a/xine-ui-nolibs.patch b/xine-ui-nolibs.patch new file mode 100644 index 0000000..8af525d --- /dev/null +++ b/xine-ui-nolibs.patch @@ -0,0 +1,13 @@ +--- xine-ui-0.9.19/configure.ac.orig Sun Mar 9 00:45:10 2003 ++++ xine-ui-0.9.19/configure.ac Sun Apr 13 13:57:32 2003 +@@ -380,8 +380,8 @@ + dnl + dnl + NET_LIBS="" +-AC_CHECK_LIB(socket, socket, NET_LIBS="-lsocket $NET_LIBS",) +-AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",) ++AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket, socket, NET_LIBS="-lsocket $NET_LIBS",)]) ++AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)]) + AC_SUBST(NET_LIBS) + + dnl diff --git a/xine-ui-opt.patch b/xine-ui-opt.patch new file mode 100644 index 0000000..5adddfb --- /dev/null +++ b/xine-ui-opt.patch @@ -0,0 +1,83 @@ +--- xine-ui-0.9.19/configure.ac.orig Sun Apr 13 13:57:32 2003 ++++ xine-ui-0.9.19/configure.ac Sun Apr 13 14:00:18 2003 +@@ -627,7 +627,7 @@ + AC_TRY_CFLAGS("$sarchopt=athlon", k7cpu="athlon", k7cpu="i686") + + dnl add x86 specific CFLAGS +- CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions" ++ CFLAGS="$CFLAGS -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions" + DEBUG_CFLAGS="$DEBUG_CFLAGS -O" + + dnl enable x86 specific parts of the code +@@ -682,19 +682,19 @@ + + alphaev56-*) + AC_DEFINE(__alpha__,1,[Define this if you're running Alpha architecture]) +- CFLAGS="$CFLAGS -O3 -mcpu=ev56 -mieee" ++ CFLAGS="$CFLAGS -mcpu=ev56 -mieee" + DEBUG_CFLAGS="$DEBUG_CFLAGS -O -mcpu=ev56 -mieee" + ;; + + alpha*) + AC_DEFINE(__alpha__,1,[Define this if you're running Alpha architecture]) +- CFLAGS="$CFLAGS -O3 -mieee" ++ CFLAGS="$CFLAGS -mieee" + DEBUG_CFLAGS="$DEBUG_CFLAGS -O -mieee" + ;; + + ppc-*-linux-* | powerpc-*) + AC_DEFINE(__ppc__,1,[Define this if you're running PowerPC architecture]) +- CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions" ++ CFLAGS="$CFLAGS -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions" + DEBUG_CFLAGS="$DEBUG_CFLAGS -O" + ;; + +@@ -702,31 +702,25 @@ + AC_DEFINE(__sparc,1,[Define this if you're running Sparc architecture]) + + if test "$GCC" = yes; then +- CFLAGS="$CFLAGS -O3" + DEBUG_CFLAGS="$DEBUG_CFLAGS -O" + else +- CFLAGS="$CFLAGS -O" + DEBUG_CFLAGS="$DEBUG_CFLAGS -O" + fi + ;; + + mips-*) +- CFLAGS="$CFLAGS -O3" + DEBUG_CFLAGS="$DEBUG_CFLAGS -O" + ;; + + m68k-*) +- CFLAGS="$CFLAGS -O2" + DEBUG_CFLAGS="$DEBUG_CFLAGS -O" + ;; + + ia64-*) +- CFLAGS="$CFLAGS -O3" + DEBUG_CFLAGS="$DEBUG_CFLAGS -O" + ;; + + s390-*) +- CFLAGS="$CFLAGS -O3" + DEBUG_CFLAGS="$DEBUG_CFLAGS -O" + ;; + +@@ -736,7 +730,7 @@ + echo + echo "Host type '$host' ($host_alias) is currently not supported by xine" + echo +- echo "Assuming that -O3 makes the compiler produce useful code." ++ echo "Assuming that $CFLAGS makes the compiler produce useful code." + echo + echo "You might experience problems with this, so please report your" + echo "architecture and, if possible, known good optimization flags for" +@@ -746,7 +740,6 @@ + echo "(sleeping one minute so you can read this...)" + sleep 60 + +- CFLAGS="$CFLAGS -O3" + DEBUG_CFLAGS="$DEBUG_CFLAGS -O" + ;; + esac diff --git a/xine-ui.spec b/xine-ui.spec index ee92494..27b406f 100644 --- a/xine-ui.spec +++ b/xine-ui.spec @@ -1,15 +1,12 @@ +# # Conditional build: -# --without aa -# --without lirc -# --with directfb - -%ifarch alpha -%define _without_lirc 1 -%endif -%ifarch sparc sparc64 +# _without_aa - without aaxine UI +# _without_lirc - without lirc support +# _with_directfb - with dfbxine UI (doesn't work now) +# +%ifarch alpha sparc sparc64 %define _without_lirc 1 %endif - Summary: A Free Video Player Summary(ko): °ø°³ µ¿¿µ»ó Ç÷¹À̾î Summary(pl): Odtwarzacz video @@ -24,16 +21,13 @@ Source0: http://xine.sourceforge.net/files/%{name}-%{version}.tar.gz Source1: xine.desktop Source2: xine.png Source3: xine_logo.png -Patch0: %{name}-DESTDIR.patch -Patch1: %{name}-dfb.patch -Patch2: %{name}-ac_am.patch -Patch3: %{name}-no_corba.patch -Patch4: %{name}-ncurses.patch -URL: http://xine.sourceforge.net -%{?_with_directfb:BuildRequires: DirectFB-devel} -%{!?_without_aa:BuildRequires: aalib-devel} -%{!?_without_aa:BuildRequires: aalib-progs} -BuildRequires: autoconf +Patch0: %{name}-ncurses.patch +Patch1: %{name}-nolibs.patch +Patch2: %{name}-opt.patch +URL: http://xine.sourceforge.net/ +%{?_with_directfb:BuildRequires: DirectFB-devel >= 0.9.10} +%{!?_without_aa:BuildRequires: aalib-devel >= 1.2.0} +BuildRequires: autoconf >= 2.53 BuildRequires: automake BuildRequires: bison BuildRequires: gettext-devel @@ -47,8 +41,6 @@ Requires: xine-plugin-audio Obsoletes: xine BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _mandir %{_prefix}/man - %description xine is a free gpl-licensed video player for unix-like systems. We support mpeg-2 and mpeg-1 system (audio + video multiplexed) streams, @@ -118,12 +110,10 @@ Video player using DirectFB library. Odtwarzacz filmów u¿ywaj±cy biblioteki DirectFB. %prep -%setup -q -n xine-ui-%{version} -#%patch0 -p1 -#%patch1 -p1 -#%patch2 -p1 -#%patch3 -p1 -%patch4 +%setup -q +%patch0 -p0 +%patch1 -p1 +%patch2 -p1 %build %{__libtoolize} @@ -170,11 +160,12 @@ rm -rf $RPM_BUILD_ROOT %lang(it) %doc doc/{README,FAQ}_it %lang(pl) %doc doc/{README,README.dxr3,FAQ}_pl %lang(uk) %doc doc/{README,FAQ}_uk +#%attr(755,root,root) %{_bindir}/fbxine (doesn't work for me) %attr(755,root,root) %{_bindir}/xine %attr(755,root,root) %{_bindir}/xine-bugreport %attr(755,root,root) %{_bindir}/xine-check %attr(755,root,root) %{_bindir}/xine-remote -%{_datadir}/xine/skins/* +%{_datadir}/xine/skins %{_datadir}/xine/desktop %{_mandir}/man1/*.1* %lang(de) %{_mandir}/de/man1/*.1* -- 2.44.0