- updated opt patch is back (-O3, -finline-functions, -funroll-loops aren't good

  options for big programs... also, athlon detection is wrong - it could produce
  broken i686 packages on athlon machine with /proc mounted)
- added system-readline patch, BR: readline-devel

Changed files:
    xine-ui-opt.patch -> 1.2
    xine-ui-system-readline.patch -> 1.1
    xine-ui.spec -> 1.60

diff --git a/xine-ui-opt.patch b/xine-ui-opt.patch
index 5adddfb5eefce1b1dfd8a09902e90301923d50ff..1c0dc6997ecca593e4c6541272bbebdbbc9f8c57 100644 (file)
--- a/xine-ui-opt.patch
+++ b/xine-ui-opt.patch
@@ -1,83 +1,105 @@
---- 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 @@
+--- xine-ui-0.9.21/configure.ac.orig   2003-05-20 21:00:16.000000000 +0200
++++ xine-ui-0.9.21/configure.ac        2003-05-20 21:12:06.000000000 +0200
+@@ -634,8 +634,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"
+-      DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
++      CFLAGS="$CFLAGS -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math"
        
        dnl enable x86 specific parts of the code
-@@ -682,19 +682,19 @@
+ 
+@@ -670,17 +669,9 @@
+               archopt_val=athlon ;;
+           esac
+ 
+-          if test x"$archopt_val" != x; then
+-              CFLAGS="$CFLAGS $sarchopt=$archopt_val"
+-              DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=$archopt_val"
+-          fi
+       ]
+       fi
+ 
+-    else
+-      dnl add x86 specific cc CFLAGS
+-      CFLAGS="$CFLAGS -O"
+-      DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
+     fi
+ 
+     AC_DEFINE(__i386__,1,[Define this if you're running x86 architecture])
+@@ -689,57 +680,39 @@
  
    alphaev56-*)
      AC_DEFINE(__alpha__,1,[Define this if you're running Alpha architecture])
 -    CFLAGS="$CFLAGS -O3 -mcpu=ev56 -mieee"
+-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O -mcpu=ev56 -mieee"
 +    CFLAGS="$CFLAGS -mcpu=ev56 -mieee"
-     DEBUG_CFLAGS="$DEBUG_CFLAGS -O -mcpu=ev56 -mieee"
++    DEBUG_CFLAGS="$DEBUG_CFLAGS -mcpu=ev56 -mieee"
      ;;
  
    alpha*)
      AC_DEFINE(__alpha__,1,[Define this if you're running Alpha architecture])
 -    CFLAGS="$CFLAGS -O3 -mieee"
+-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O -mieee"
 +    CFLAGS="$CFLAGS -mieee"
-     DEBUG_CFLAGS="$DEBUG_CFLAGS -O -mieee"
++    DEBUG_CFLAGS="$DEBUG_CFLAGS -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"
+-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
 +    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 @@
+   sparc64-*-linux-* | sparc-*)
      AC_DEFINE(__sparc,1,[Define this if you're running Sparc architecture])
  
-     if test "$GCC" = yes; then
+-    if test "$GCC" = yes; then
 -      CFLAGS="$CFLAGS -O3"
-       DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
-     else
+-      DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
+-    else
 -      CFLAGS="$CFLAGS -O"
-       DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
-     fi
+-      DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
+-    fi
      ;;
  
    mips-*)
 -    CFLAGS="$CFLAGS -O3"
-     DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
+-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
      ;;
  
    m68k-*)
 -    CFLAGS="$CFLAGS -O2"
-     DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
+-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
      ;;
  
    ia64-*)
 -    CFLAGS="$CFLAGS -O3"
-     DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
+-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
+     ;;
+ 
+   hppa*-hp-*)
+-    CFLAGS="$CFLAGS -O2"
+-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
      ;;
  
    s390-*)
 -    CFLAGS="$CFLAGS -O3"
-     DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
+-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
      ;;
  
-@@ -736,7 +730,7 @@
-     echo
-     echo "Host type '$host' ($host_alias) is currently not supported by xine"
+   *)
+@@ -755,11 +728,6 @@
+     echo "your compiler to <xine-devel@lists.sf.net>"\!
      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 "\a(sleeping one minute so you can read this...)"
-     sleep 60
- 
+     echo "*********************************************************************"
+-    echo "\a(sleeping one minute so you can read this...)"
+-    sleep 60
+-
 -    CFLAGS="$CFLAGS -O3"
-     DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
+-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
      ;;
  esac
+ 

diff --git a/xine-ui-system-readline.patch b/xine-ui-system-readline.patch
new file mode 100644 (file)
index 0000000..7463018
--- /dev/null
+++ b/xine-ui-system-readline.patch
@@ -0,0 +1,48 @@
+--- xine-ui-0.9.21/configure.ac.orig   2003-05-20 21:12:06.000000000 +0200
++++ xine-ui-0.9.21/configure.ac        2003-05-20 21:14:38.000000000 +0200
+@@ -824,7 +824,7 @@
+ dnl
+ dnl Some include paths ( !!! DO NOT REMOVE !!! )
+ dnl
+-INCLUDES='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/readline -I$(top_builddir)/readline -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/common -I$(top_builddir)/src/common -I$(top_srcdir)/src/xitk/xine-toolkit -I$(top_builddir)/src/xitk/xine-toolkit -I$(prefix)/include $(INTLDIR)'
++INCLUDES='-I$(top_srcdir) -I$(top_builddir) -I/usr/include/readline -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/common -I$(top_builddir)/src/common -I$(top_srcdir)/src/xitk/xine-toolkit -I$(top_builddir)/src/xitk/xine-toolkit -I$(prefix)/include $(INTLDIR)'
+ AC_SUBST(INCLUDES)
+ 
+ AC_DEFINE(NEED_MRLBROWSER,,[Define this to add mrl browser into xitk lib])
+--- xine-ui-0.9.21/Makefile.am.orig    2003-03-25 15:33:01.000000000 +0100
++++ xine-ui-0.9.21/Makefile.am 2003-05-20 21:13:58.000000000 +0200
+@@ -6,7 +6,7 @@
+ 
+ ACLOCAL_AMFLAGS = @XINE_ACFLAGS@ -I m4
+ 
+-SUBDIRS = doc m4 readline intl po misc src  
++SUBDIRS = doc m4 intl po misc src  
+ 
+ DEBFILES = debian/README.Debian debian/changelog debian/control \
+       debian/copyright debian/links debian/menu \
+--- xine-ui-0.9.21/src/xitk/Makefile.am.orig   2003-03-13 20:10:33.000000000 +0100
++++ xine-ui-0.9.21/src/xitk/Makefile.am        2003-05-20 21:15:20.000000000 +0200
+@@ -48,11 +48,10 @@
+            $(X_LIBS) $(XTEST_LIBS) $(CURL_LIBS) -lX11 -lm $(DBG_LIBS)
+ 
+ xine_remote_SOURCES = xine-remote.c
+-xine_remote_DEPENDENCIES = $(top_builddir)/readline/libreadline.la \
+-                         $(top_builddir)/src/common/libcommon.la \
++xine_remote_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la \
+                          xine-remote.c
+ xine_remote_LDADD = $(NET_LIBS) $(THREAD_LIBS) \
+-      $(top_builddir)/readline/libreadline.la $(TERMCAP_LIB) \
++      -lreadline $(TERMCAP_LIB) \
+       $(top_builddir)/src/common/libcommon.la $(DBG_LIBS)
+ 
+ session_ctrl_LDADD = @XINE_LIBS@ $(top_builddir)/src/common/libcommon.la $(DBG_LIBS)
+@@ -87,9 +86,6 @@
+       videowin.h \
+       viewlog.h
+ 
+-$(top_builddir)/readline/libreadline.la:
+-      @cd $(top_builddir)/readline && $(MAKE) libreadline.la
+-
+ $(top_builddir)/src/common/libcommon.la:
+       @cd $(top_builddir)/src/common && $(MAKE) libcommon.la
+ 

diff --git a/xine-ui.spec b/xine-ui.spec
index cad9695f47a7296803a58da90156b5ccfb09cec9..bd8a9c04ed12cab220eab53e3056ea526d929d54 100644 (file)
--- a/xine-ui.spec
+++ b/xine-ui.spec
@@ -23,6 +23,8 @@ Source2:      xine.png
 Source3:       xine_logo.png
 Patch0:                %{name}-ncurses.patch
 Patch1:                %{name}-nolibs.patch
+Patch2:                %{name}-opt.patch
+Patch3:                %{name}-system-readline.patch
 URL:           http://xine.sourceforge.net/
 %{?_with_directfb:BuildRequires:       DirectFB-devel >= 0.9.10}
 %{!?_without_aa:BuildRequires:         aalib-devel >= 1.2.0}
@@ -35,6 +37,7 @@ BuildRequires:        libtool
 %{!?_without_lirc:BuildRequires:       lirc-devel}
 BuildRequires: ncurses-devel
 BuildRequires: pkgconfig
+BuildRequires: readline-devel >= 4.2a
 BuildRequires: xine-lib-devel >= %{version}
 Requires:      xine-plugin-audio
 Obsoletes:     xine
@@ -112,6 +115,8 @@ Odtwarzacz film
 %setup -q
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}