mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

62 lines
2.9 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/jimmy/mplayer/head.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./configure.orig 2004-07-15 00:04:42.000000000 +0200
  20. +++ ./configure 2004-08-12 06:30:02.000000000 +0200
  21. @@ -513,7 +513,7 @@
  22. if test "$_skip_cc_check" != yes ; then
  23. for _cc in "$_cc" gcc gcc-3.3 gcc-3.2 gcc-3.1 gcc3 gcc-3.0 cc ; do
  24. echocheck "$_cc version"
  25. - cc_name=`( $_cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1`
  26. + cc_name=`( $_cc -v ) 2>&1 | tail -n1 | cut -d ' ' -f 1`
  27. cc_version=`( $_cc -dumpversion ) 2>&1`
  28. if test "$?" -gt 0; then
  29. cc_version="not found"
  30. @@ -623,15 +623,15 @@
  31. _def_arch="#define ARCH_X86 1"
  32. _target_arch="TARGET_ARCH_X86 = yes"
  33. - pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`
  34. - pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
  35. - pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
  36. - pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
  37. - pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
  38. + pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n1`
  39. + pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n1`
  40. + pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n1`
  41. + pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n1`
  42. + pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n1`
  43. - pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | head -1`
  44. + pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | head -n1`
  45. if test -z "$pparam" ; then
  46. - pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | head -1`
  47. + pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | head -n1`
  48. fi
  49. _mmx=no
  50. @@ -884,7 +884,7 @@
  51. echocheck "CPU type"
  52. if linux && test -n "$_cpuinfo"; then
  53. - proc=`$_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ',' -f 1 | cut -b 2- | head -1`
  54. + proc=`$_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ',' -f 1 | cut -b 2- | head -n1`
  55. if test -n "`$_cpuinfo | grep altivec`"; then
  56. _altivec=yes
  57. fi