Menu
▾
▴
[ddccontrol-cvs] ddccontrol-db/db Makefile.am,1.7,1.8 Makefile.in,1.10,1.11 options.xml,1.27,1.28 options.xml.h,1.9,1.10 options.xml.in,1.12,1.13
|
From: Nicolas B. <nbo...@us...> - 2006-02-23 00:54:34
|
Update of /cvsroot/ddccontrol/ddccontrol-db/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1092/db Modified Files: Makefile.am Makefile.in options.xml options.xml.h options.xml.in Log Message: Update Samsung monitors to use generic profiles. Index: options.xml.h =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/options.xml.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- options.xml.h 14 Feb 2006 14:46:04 -0000 1.9 +++ options.xml.h 23 Feb 2006 00:54:31 -0000 1.10 @@ -129,7 +129,6 @@ printf(_("Bottom left screen purity")); printf(_("Bottom right screen purity")); printf(_("Various")); -printf(_("Focus")); printf(_("Landing Adjust (RGB alignment)")); printf(_("Sharpness")); printf(_("Others")); @@ -158,6 +157,9 @@ printf(_("Disable")); printf(_("Enable")); printf(_("Enable only brightness/contrast settings")); +printf(_("On Screen Display (Samsung)")); +printf(_("Disable")); +printf(_("Enable")); printf(_("OSD Orientation")); printf(_("Landscape")); printf(_("Portrait")); Index: options.xml =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/options.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- options.xml 22 Feb 2006 22:16:39 -0000 1.27 +++ options.xml 23 Feb 2006 00:54:31 -0000 1.28 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!---Do not edit this file, edit options.xml.in instead.--> -<options date="20050813" dbversion="3"> +<options date="20060222" dbversion="3"> <group name="Color settings"> <subgroup name="Brightness and Contrast" pattern="brightnesscontrast"> <control id="brightness" type="value" name="Brightness" address="0x10"/> @@ -160,7 +160,6 @@ <control id="brpurity" type="value" name="Bottom right screen purity" address="0xEB"/> </subgroup> <subgroup name="Various"> - <control id="focus" type="value" name="Focus" address="0x1C"/> <control id="landing" type="value" name="Landing Adjust (RGB alignment)" address="0x5C"/> <control id="sharpness" type="value" name="Sharpness" address="0x8c"/> </subgroup> @@ -197,6 +196,10 @@ <value id="enable" name="Enable"/> <value id="partenable" name="Enable only brightness/contrast settings"/> </control> + <control id="osd2" type="list" name="On Screen Display (Samsung)" address="0xf5"> <!--- Samsung has 2 OSD controls --> + <value id="disable" name="Disable"/> + <value id="enable" name="Enable"/> + </control> <control id="osdorientation" type="list" name="OSD Orientation" address="0xaa"> <value id="landscape" name="Landscape"/> <value id="portrait" name="Portrait"/> Index: Makefile.in =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile.in 22 Feb 2006 22:16:38 -0000 1.10 +++ Makefile.in 23 Feb 2006 00:54:31 -0000 1.11 @@ -34,11 +34,16 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ subdir = db DIST_COMMON = $(nobase_dist_data_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -57,16 +62,25 @@ DATA = $(nobase_dist_data_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ +DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EXEEXT = @EXEEXT@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMSGFMT = @GMSGFMT@ HAVE_PERL_FALSE = @HAVE_PERL_FALSE@ HAVE_PERL_TRUE = @HAVE_PERL_TRUE@ @@ -74,8 +88,40 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ +INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_ICONV = @INTLTOOL_ICONV@ +INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ +INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ +INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ +INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ +INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ +INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ +INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ +INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ +INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ +INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ +INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ @@ -84,6 +130,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -92,21 +139,35 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +POSUB = @POSUB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +ac_ct_CC = @ac_ct_CC@ ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__include = @am__include@ am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +build = @build@ build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ datadir = @datadir@/ddccontrol-db exec_prefix = @exec_prefix@ +host = @host@ host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -320,7 +381,7 @@ make options.xml check-db: options.xml - ls monitor/*.xml | awk -F/ '{print $$2}' | awk -F. '{print "ddccontrol -b . -v -v -i " $$1 "\nif [ $$? = 1 ]; then\nexit 1;\nfi"}' | bash - + ls monitor/*.xml | awk -F/ '{print $$2}' | awk -F. '{print "grep -q NOCHECKDB monitor/" $$1 ".xml\nif [ $$? = 1 ]; then\n ddccontrol -b . -v -v -i " $$1 "\nif [ $$? = 1 ]; then\nexit 1;\nfi\nfi"}' | bash - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: Index: Makefile.am =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.am 13 Jul 2005 23:30:02 -0000 1.7 +++ Makefile.am 23 Feb 2006 00:54:31 -0000 1.8 @@ -26,4 +26,4 @@ make options.xml check-db: options.xml - ls monitor/*.xml | awk -F/ '{print $$2}' | awk -F. '{print "ddccontrol -b . -v -v -i " $$1 "\nif [ $$? = 1 ]; then\nexit 1;\nfi"}' | bash - + ls monitor/*.xml | awk -F/ '{print $$2}' | awk -F. '{print "grep -q NOCHECKDB monitor/" $$1 ".xml\nif [ $$? = 1 ]; then\n ddccontrol -b . -v -v -i " $$1 "\nif [ $$? = 1 ]; then\nexit 1;\nfi\nfi"}' | bash - Index: options.xml.in =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/options.xml.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- options.xml.in 22 Feb 2006 22:16:39 -0000 1.12 +++ options.xml.in 23 Feb 2006 00:54:31 -0000 1.13 @@ -159,7 +159,6 @@ <control id="brpurity" type="value" name="Bottom right screen purity" address="0xEB"/> </subgroup> <subgroup name="Various"> - <control id="focus" type="value" name="Focus" address="0x1C"/> <control id="landing" type="value" name="Landing Adjust (RGB alignment)" address="0x5C"/> <control id="sharpness" type="value" name="Sharpness" address="0x8c"/> </subgroup> @@ -196,6 +195,10 @@ <value id="enable" name="Enable"/> <value id="partenable" name="Enable only brightness/contrast settings"/> </control> + <control id="osd2" type="list" name="On Screen Display (Samsung)" address="0xf5"> <!--- Samsung has 2 OSD controls --> + <value id="disable" name="Disable"/> + <value id="enable" name="Enable"/> + </control> <control id="osdorientation" type="list" name="OSD Orientation" address="0xaa"> <value id="landscape" name="Landscape"/> <value id="portrait" name="Portrait"/> |
