rpms/monitor-edid/F-8 monitor-edid-makesource.sh, NONE, 1.1 monitor-edid-system-lrmi.patch, NONE, 1.1 monitor-edid.spec, NONE, 1.1 sources, 1.1, 1.2

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/monitor-edid/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25053

Modified Files:
	sources 
Added Files:
	monitor-edid-makesource.sh monitor-edid-system-lrmi.patch 
	monitor-edid.spec 
Log Message:
new package


--- NEW FILE monitor-edid-makesource.sh ---
#!/bin/sh

# check http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/monitor-edid/trunk/

VERSION=1.16
RELEASE=238912

svn export -r $RELEASE http://svn.mandriva.com/svn/soft/monitor-edid/trunk monitor-edid-$VERSION && \
  tar cjf monitor-edid-$VERSION.tar.bz2 monitor-edid-$VERSION && \
  rm -rf monitor-edid-$VERSION && \
  echo monitor-edid-$VERSION.tar.bz2 created


monitor-edid-system-lrmi.patch:

--- NEW FILE monitor-edid-system-lrmi.patch ---
diff -up monitor-edid-1.16/vbe.c~ monitor-edid-1.16/vbe.c
--- monitor-edid-1.16/vbe.c~	2008-01-08 20:14:54.000000000 +0200
+++ monitor-edid-1.16/vbe.c	2008-04-05 23:54:59.000000000 +0300
@@ -157,7 +157,7 @@ int vbe_get_edid_info(hd_data_t *hd_data
 }
 
 #ifdef LRMI
-#include "lrmi.h"
+#include <lrmi.h>
 
 static int vbe_check_vbe_info__old(void)
 {
diff -up monitor-edid-1.16/Makefile~ monitor-edid-1.16/Makefile
--- monitor-edid-1.16/Makefile~	2008-03-10 09:53:34.000000000 +0200
+++ monitor-edid-1.16/Makefile	2008-04-05 23:54:39.000000000 +0300
@@ -30,7 +30,7 @@ CFLAGS = -O -Wall -g
 OBJS = monitor-get-edid-using-vbe.c vbe.o libint10.a libx86emu.a
 
 ifeq (i386,$(ARCH))
-OBJS += lrmi.o
+monitor-get-edid-using-vbe: LDFLAGS += -llrmi
 endif
 
 all: $(TARGETS)


--- NEW FILE monitor-edid.spec ---
Name:           monitor-edid
Summary:        Tool for probing and parsing monitor EDID

# monitor-edid is LGPL, lrmi is MIT, cvt & x86emu are BSD
License:        LGPLv2+ and BSD
Group:          System Environment/Base
Url:            http://wiki.mandriva.com/en/Tools/monitor-edid

Version:        1.16
Release:        4%{?dist}

# run monitor-edid-makesource.sh to create
Source0:        %{name}-%{version}.tar.bz2
Source1:        %{name}-makesource.sh

Patch0:         %{name}-system-lrmi.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%ifarch %{ix86} 
BuildRequires: lrmi-devel
%endif

%description
Monitor-edid is a tool for probing and parsing Extended display 
identification data (EDID) from monitors.  
For more information about EDID, see http://en.wikipedia.org/wiki/EDID


%prep
%setup -q

# use system LRMI
%patch0 -p1
rm -f lrmi.c lrmi.h

cp x86emu/LICENSE LICENSE.x86emu


%build
make CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README NEWS COPYING LICENSE.x86emu
%{_bindir}/*
%{_sbindir}/*


%changelog
* Sun Apr 06 2008 Remi Collet <Fedora at famillecollet.com> 1.16-4
- use system lrmi on ix86 (From Ville Skyttä)

* Mon Mar 17 2008 Remi Collet <Fedora at famillecollet.com> 1.16-3
- fix license again

* Sun Mar 16 2008 Remi Collet <Fedora at famillecollet.com> 1.16-2
- From review : clean + fix license

* Sun Mar 16 2008 Remi Collet <Fedora at famillecollet.com> 1.16-1
- initial spec for Fedora review

* Mon Mar 10 2008 Pixel <pixel at mandriva.com> 1.16-1mdv2008.1
+ Revision: 183268
- update URL
- 1.16:
- do not install monitor-get-edid-using-vbe on archs where VBE is not
  available (Remi Collet)

* Sun Mar  9 2008 Remi Collet <rpms at famillecollet.com> 1.15-1.fc#.remi
- build for Fedora

* Wed Jan 23 2008 Pixel <pixel at mandriva.com> 1.15-1mdv2008.1
+ Revision: 157016
- 1.15:
- monitor-probe:
  o probe "using DMI" before "using X"
- monitor-probe-using-X:
  o in last resort, get Intel BIOS mode when "BIOS panel mode is bigger than
    probed programmed mode"

* Thu Jan 10 2008 Pixel <pixel at mandriva.com> 1.14-1mdv2008.1
+ Revision: 147502
- 1.14:
- monitor-edid, monitor-get-edid:
  o call monitor-get-edid-using-vbe with a range of ports, it stops on first
    success (by default it tries port 0 then port 1)

* Tue Jan 08 2008 Pixel <pixel at mandriva.com> 1.13-1mdv2008.1
+ Revision: 146846
- 1.13:
- monitor-get-edid:
  o skip /proc/acpi/video/**/EDID files which can't be valid (#34417)
  o minimal support for getting EDID from different DDC port
    (experimental, need testing before using it in monitor-edid)

  + Olivier Blin <oblin at mandriva.com>
    - restore BuildRoot

  + Thierry Vignaud <tvignaud at mandriva.com>
    - kill re-definition of %%buildroot on Pixel's request

* Sat Dec 15 2007 Remi Collet <rpms at famillecollet.com> 1.11-1.fc8.remi
- build for Fedora 8

* Wed Sep 26 2007 Pixel <pixel at mandriva.com> 1.12-1mdv2008.0
+ Revision: 93044
- use make install
- 1.12:
- monitor-probe-using-X:
  o when an EDID is found in Xorg.log, pass it to monitor-parse-edid
  o handle --perl option (passed to monitor-parse-edid)

* Fri Mar 30 2007 Remi Collet <rpms at famillecollet.com> 1.11-1
- build for Fedora 3-6 and RedHat EL 2-5

* Thu Aug 31 2006 Gwenole Beauchesne <gbeauchesne at mandriva.com> 1.11-1mdv2007.0
- fix ballback to old get_edid() function
- ignore VBIOS checksum failures, use CPU emulator in that case

* Tue Jul 11 2006 Pixel <pixel at mandriva.com> 1.10-1mdv2007.0
- use a fixed FontPath (do not default to unix:-1 in case xfs is not running)

* Wed Jun 07 2006 Per Øyvind Karlsen <pkarlsen at mandriva.com> 1.9-5mdv2007.0
- do not build on sparc
- build with $RPM_OPT_FLAGS
- do parallell build
- cosmetics

* Wed May 10 2006 Pixel <pixel at mandriva.com> 1.9-4mdk
- fix a segfault occuring on some boxes in monitor-get-edid-using-vbe, 
  when using try-in-console

* Fri Mar 10 2006 Pixel <pixel at mandriva.com> 1.9-3mdk
- set url to wiki page instead of the cvs

* Fri Jan  6 2006 Pixel <pixel at mandriva.com> 1.9-2mdk
- add missing monitor-get-edid

* Thu Jan  5 2006 Pixel <pixel at mandriva.com> 1.9-1mdk
- monitor-get-edid is now a perl script able to probe /proc/acpi/video
  (or /proc/device-tree on PPC)
- binary monitor-get-edid is now monitor-get-edid-using-vbe
- monitor-edid is able to get more than one head

* Mon Aug  8 2005 Pixel <pixel at mandriva.com> 1.5-1mdk
- add option --try-in-console when probing edid
  since probing edid sometimes only work in console
- use this option by default in monitor-probe

* Wed Apr  6 2005 Pixel <pixel at mandrakesoft.com> 1.4-1mdk
- default on old lrmi code to get ddc via int10
- fix build on vesa-cvt

* Fri Mar 25 2005 Pixel <pixel at mandrakesoft.com> 1.3-1mdk
- added vesa-cvt (allowing to compute reduced-blanking timings)

* Thu Mar 17 2005 Pixel <pixel at mandrakesoft.com> 1.2-1mdk
- new release (added monitor-probe and monitor-probe-using-X)

* Tue Mar  8 2005 Pixel <pixel at mandrakesoft.com> 1.1-1mdk
- new release

* Wed Feb 23 2005 Pixel <pixel at mandrakesoft.com> 1.0-1mdk
- first package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2008 04:00:08 -0000	1.1
+++ sources	7 Apr 2008 05:09:32 -0000	1.2
@@ -0,0 +1 @@
+d90a9c03efd3bf2741ead193c95ef0e1  monitor-edid-1.16.tar.bz2