November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit python-smbc for openSUSE:Factory
by root＠hilbert.suse.de 10 Nov '10

10 Nov '10

Hello community, here is the log from the commit of package python-smbc for openSUSE:Factory checked in at Wed Nov 10 19:15:35 CET 2010. -------- --- python-smbc/python-smbc.changes 2010-09-06 16:36:46.000000000 +0200 +++ python-smbc/python-smbc.changes 2010-11-10 14:39:17.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Nov 10 14:02:41 CET 2010 - vuntz(a)opensuse.org + +- Update to version 1.0.10: + + smbc.NoSpaceError + + Now buildable against Python 3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pysmbc-1.0.9.tar.bz2 New: ---- pysmbc-1.0.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-smbc.spec ++++++ --- /var/tmp/diff_new_pack.4ReQqj/_old 2010-11-10 19:14:35.000000000 +0100 +++ /var/tmp/diff_new_pack.4ReQqj/_new 2010-11-10 19:14:35.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package python-smbc (Version 1.0.9) +# spec file for package python-smbc (Version 1.0.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,10 @@ %define _name pysmbc BuildRequires: libsmbclient-devel BuildRequires: python-devel -Version: 1.0.9 -Release: 2 +BuildRequires: python3-devel +Version: 1.0.10 +Release: 1 +# FIXME: once we have proper macros for python3 packaging, build a python3-smbc subpackage Group: Development/Libraries/Python License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ pysmbc-1.0.9.tar.bz2 -> pysmbc-1.0.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.9/Makefile new/pysmbc-1.0.10/Makefile --- old/pysmbc-1.0.9/Makefile 2010-06-29 07:18:10.000000000 +0200 +++ new/pysmbc-1.0.10/Makefile 2010-08-22 16:59:36.000000000 +0200 @@ -9,6 +9,8 @@ doc: smbc.so rm -rf html epydoc -o html --html $< + +doczip: doc cd html && zip ../smbc-html.zip * clean: @@ -25,5 +27,5 @@ if [ -n "$$DESTDIR" ]; then ROOT="--root $$DESTDIR"; fi; \ python setup.py install $$ROOT -.PHONY: doc clean dist install force +.PHONY: doc doczip clean dist install force diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.9/NEWS new/pysmbc-1.0.10/NEWS --- old/pysmbc-1.0.9/NEWS 2010-06-29 07:56:00.000000000 +0200 +++ new/pysmbc-1.0.10/NEWS 2010-11-01 17:21:31.000000000 +0100 @@ -1,6 +1,11 @@ NEWS ---- +New in 1.0.10: + +* smbc.NoSpaceError +* Now compiles against Python 3 + New in 1.0.9: * iteration file read diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.9/PKG-INFO new/pysmbc-1.0.10/PKG-INFO --- old/pysmbc-1.0.9/PKG-INFO 2010-07-05 10:23:10.000000000 +0200 +++ new/pysmbc-1.0.10/PKG-INFO 2010-11-01 17:23:22.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: pysmbc -Version: 1.0.9 +Version: 1.0.10 Summary: Python bindings for libsmbclient Home-page: http://cyberelk.net/tim/software/pysmbc/ Author: ['Tim Waugh <twaugh(a)redhat.com>', 'Tsukasa Hamano <hamano(a)osstech.co.jp>'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.9/context.c new/pysmbc-1.0.10/context.c --- old/pysmbc-1.0.9/context.c 2010-07-01 07:01:39.000000000 +0200 +++ new/pysmbc-1.0.10/context.c 2010-10-25 16:49:16.000000000 +0200 @@ -2,9 +2,11 @@ * pysmbc - Python bindings for libsmbclient * Copyright (C) 2002, 2005, 2006, 2007, 2008, 2010 Red Hat, Inc * Copyright (C) 2010 Open Source Solution Technology Corporation + * Copyright (C) 2010 Patrick Geltinger <patlkli(a)patlkli.org> * Authors: * Tim Waugh <twaugh(a)redhat.com> * Tsukasa Hamano <hamano(a)osstech.co.jp> + * Patrick Geltinger <patlkli(a)patlkli.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -170,7 +172,7 @@ smbc_free_context (self->context, 1); } - self->ob_type->tp_free ((PyObject *) self); + Py_TYPE(self)->tp_free ((PyObject *) self); } static PyObject * @@ -269,7 +271,7 @@ pysmbc_SetFromErrno(); return NULL; } - return PyInt_FromLong(ret); + return PyLong_FromLong(ret); } static PyObject * @@ -296,7 +298,7 @@ pysmbc_SetFromErrno(); return NULL; } - return PyInt_FromLong(ret); + return PyLong_FromLong(ret); } static PyObject * @@ -350,7 +352,7 @@ pysmbc_SetFromErrno(); return NULL; } - return PyInt_FromLong(ret); + return PyLong_FromLong(ret); } static PyObject * @@ -371,7 +373,7 @@ pysmbc_SetFromErrno(); return NULL; } - return PyInt_FromLong(ret); + return PyLong_FromLong(ret); } static PyObject * @@ -424,28 +426,33 @@ pysmbc_SetFromErrno(); return NULL; } - return PyInt_FromLong(ret); + return PyLong_FromLong(ret); } static PyObject * Context_getDebug (Context *self, void *closure) { int d = smbc_getDebug (self->context); - return PyInt_FromLong (d); + return PyLong_FromLong (d); } static int Context_setDebug (Context *self, PyObject *value, void *closure) { int d; + +#if PY_MAJOR_VERSION < 3 + if (PyInt_Check(value)) + value = PyLong_FromLong(PyInt_AsLong(value)); +#endif - if (!PyInt_Check (value)) + if (!PyLong_Check (value)) { PyErr_SetString (PyExc_TypeError, "must be int"); return -1; } - d = PyInt_AsLong (value); + d = PyLong_AsLong (value); smbc_setDebug (self->context, d); return 0; } @@ -454,26 +461,62 @@ Context_getNetbiosName (Context *self, void *closure) { const char *netbios_name = smbc_getNetbiosName (self->context); - return PyString_FromString (netbios_name); + return PyUnicode_FromString (netbios_name); } static int Context_setNetbiosName (Context *self, PyObject *value, void *closure) { + wchar_t *w_name; + size_t chars; char *name; + size_t bytes; + ssize_t written; - if (!PyString_Check (value)) +#if PY_MAJOR_VERSION < 3 + if (PyString_Check(value)) + value = PyUnicode_FromString(PyString_AsString(value)); +#endif + + if (!PyUnicode_Check (value)) { PyErr_SetString (PyExc_TypeError, "must be string"); return -1; } - name = strdup (PyString_AsString (value)); + chars = PyUnicode_GetSize (value); /* not including NUL */ + w_name = malloc((chars + 1) * sizeof (wchar_t)); + if (!w_name) + { + PyErr_NoMemory (); + return -1; + } + + if (PyUnicode_AsWideChar ((PyUnicodeObject *) value, w_name, chars) == -1) + { + free (w_name); + return -1; + } + + w_name[chars] = L'\0'; + bytes = MB_CUR_MAX * chars + 1; /* extra byte for NUL */ + name = malloc (bytes); if (!name) { + free (w_name); + PyErr_NoMemory (); return -1; } + written = wcstombs (name, w_name, bytes); + free (w_name); + + if (written == -1) + name[0] = '\0'; + else + /* NUL-terminate it (this is why we allocated an extra byte) */ + name[written] = '\0'; + smbc_setNetbiosName (self->context, name); // Don't free name: the API function just takes a reference(!) return 0; @@ -483,26 +526,63 @@ Context_getWorkgroup (Context *self, void *closure) { const char *workgroup = smbc_getWorkgroup (self->context); - return PyString_FromString (workgroup); + return PyUnicode_FromString (workgroup); } static int Context_setWorkgroup (Context *self, PyObject *value, void *closure) { + wchar_t *w_workgroup; + size_t chars; char *workgroup; + size_t bytes; + ssize_t written; + +#if PY_MAJOR_VERSION < 3 + if (PyString_Check(value)) + value = PyUnicode_FromString(PyString_AsString(value)); +#endif - if (!PyString_Check (value)) + if (!PyUnicode_Check (value)) { PyErr_SetString (PyExc_TypeError, "must be string"); return -1; } - workgroup = strdup (PyString_AsString (value)); + chars = PyUnicode_GetSize (value); /* not including NUL */ + w_workgroup = malloc ((chars + 1) * sizeof (wchar_t)); + if (!w_workgroup) + { + PyErr_NoMemory (); + return -1; + } + + if (PyUnicode_AsWideChar ((PyUnicodeObject *) value, + w_workgroup, chars) == -1) + { + free (w_workgroup); + return -1; + } + + w_workgroup[chars] = L'\0'; + bytes = MB_CUR_MAX * chars + 1; /* extra byte for NUL */ + workgroup = malloc (bytes); if (!workgroup) { + free (w_workgroup); + PyErr_NoMemory (); return -1; } + written = wcstombs (workgroup, w_workgroup, bytes); + free (w_workgroup); + + if (written == -1) + workgroup[0] = '\0'; + else + /* NUL-terminate it (this is why we allocated the extra byte) */ + workgroup[written] = '\0'; + smbc_setWorkgroup (self->context, workgroup); // Don't free workgroup: the API function just takes a reference(!) return 0; @@ -680,50 +760,113 @@ { NULL } /* Sentinel */ }; - -PyTypeObject smbc_ContextType = - { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ - "smbc.Context", /*tp_name*/ - sizeof(Context), /*tp_basicsize*/ - 0, /*tp_itemsize*/ - (destructor)Context_dealloc, /*tp_dealloc*/ - 0, /*tp_print*/ - 0, /*tp_getattr*/ - 0, /*tp_setattr*/ - 0, /*tp_compare*/ - 0, /*tp_repr*/ - 0, /*tp_as_number*/ - 0, /*tp_as_sequence*/ - 0, /*tp_as_mapping*/ - 0, /*tp_hash */ - 0, /*tp_call*/ - 0, /*tp_str*/ - 0, /*tp_getattro*/ - 0, /*tp_setattro*/ - 0, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT, /*tp_flags*/ - "SMBC context\n" - "============\n\n" - - " A context for libsmbclient calls." - "", /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - Context_methods, /* tp_methods */ - 0, /* tp_members */ - Context_getseters, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)Context_init, /* tp_init */ - 0, /* tp_alloc */ - Context_new, /* tp_new */ - }; +#if PY_MAJOR_VERSION >= 3 + PyTypeObject smbc_ContextType = + { + PyVarObject_HEAD_INIT(NULL, 0) + "smbc.Context", /*tp_name*/ + sizeof(Context), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + (destructor)Context_dealloc, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_reserved*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ + "SMBC context\n" + "============\n\n" + + " A context for libsmbclient calls.\n\n" + "Optional parameters are:\n\n" + "auth_fn: a function for collecting authentication details from\n" + "the user. This is called whenever authentication details are needed.\n" + "The parameters it will be given are all strings: server, share,\n" + "workgroup, username, and password (these last two can be ignored).\n" + "The function should return a tuple of strings: workgroup, username,\n" + "and password.\n\n" + "debug: an integer representing the debug level to use.\n" + "", /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + Context_methods, /* tp_methods */ + 0, /* tp_members */ + Context_getseters, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)Context_init, /* tp_init */ + 0, /* tp_alloc */ + Context_new, /* tp_new */ + }; +#else + PyTypeObject smbc_ContextType = + { + PyObject_HEAD_INIT(NULL) + 0, /*ob_size*/ + "smbc.Context", /*tp_name*/ + sizeof(Context), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + (destructor)Context_dealloc, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ + "SMBC context\n" + "============\n\n" + + " A context for libsmbclient calls.\n\n" + "Optional parameters are:\n\n" + "auth_fn: a function for collecting authentication details from\n" + "the user. This is called whenever authentication details are needed.\n" + "The parameters it will be given are all strings: server, share,\n" + "workgroup, username, and password (these last two can be ignored).\n" + "The function should return a tuple of strings: workgroup, username,\n" + "and password.\n\n" + "debug: an integer representing the debug level to use.\n" + "", /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + Context_methods, /* tp_methods */ + 0, /* tp_members */ + Context_getseters, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)Context_init, /* tp_init */ + 0, /* tp_alloc */ + Context_new, /* tp_new */ + }; +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.9/dir.c new/pysmbc-1.0.10/dir.c --- old/pysmbc-1.0.9/dir.c 2010-07-05 10:01:22.000000000 +0200 +++ new/pysmbc-1.0.10/dir.c 2010-10-25 16:17:36.000000000 +0200 @@ -1,6 +1,7 @@ /* -*- Mode: C; c-file-style: "gnu" -*- * pysmbc - Python bindings for libsmbclient * Copyright (C) 2002, 2005, 2006, 2007, 2008 Tim Waugh <twaugh(a)redhat.com> + * Copyright (C) 2010 Patrick Geltinger <patlkli(a)patlkli.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -103,7 +104,7 @@ Py_DECREF ((PyObject *) self->context); } - self->ob_type->tp_free ((PyObject *) self); + Py_TYPE(self)->tp_free ((PyObject *) self); } static PyObject * @@ -142,9 +143,9 @@ PyObject *largs = Py_BuildValue ("()"); PyObject *lkwlist; int len = dirp->dirlen; - PyObject *name = PyString_FromString (dirp->name); - PyObject *type = PyInt_FromLong (dirp->smbc_type); - PyObject *comment = PyString_FromString (dirp->comment); + PyObject *name = PyUnicode_FromString (dirp->name); + PyObject *type = PyLong_FromLong (dirp->smbc_type); + PyObject *comment = PyUnicode_FromString (dirp->comment); lkwlist = PyDict_New (); PyDict_SetItemString (lkwlist, "name", name); PyDict_SetItemString (lkwlist, "comment", comment); @@ -180,49 +181,98 @@ { NULL } /* Sentinel */ }; -PyTypeObject smbc_DirType = - { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ - "smbc.Dir", /*tp_name*/ - sizeof(Dir), /*tp_basicsize*/ - 0, /*tp_itemsize*/ - (destructor)Dir_dealloc, /*tp_dealloc*/ - 0, /*tp_print*/ - 0, /*tp_getattr*/ - 0, /*tp_setattr*/ - 0, /*tp_compare*/ - 0, /*tp_repr*/ - 0, /*tp_as_number*/ - 0, /*tp_as_sequence*/ - 0, /*tp_as_mapping*/ - 0, /*tp_hash */ - 0, /*tp_call*/ - 0, /*tp_str*/ - 0, /*tp_getattro*/ - 0, /*tp_setattro*/ - 0, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT, /*tp_flags*/ - "SMBC Dir\n" - "========\n\n" - - " A directory object." - "", /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - Dir_methods, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)Dir_init, /* tp_init */ - 0, /* tp_alloc */ - Dir_new, /* tp_new */ - }; +#if PY_MAJOR_VERSION >= 3 + PyTypeObject smbc_DirType = + { + PyVarObject_HEAD_INIT(NULL, 0) + "smbc.Dir", /*tp_name*/ + sizeof(Dir), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + (destructor)Dir_dealloc, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_reserved*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ + "SMBC Dir\n" + "========\n\n" + + " A directory object." + "", /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + Dir_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)Dir_init, /* tp_init */ + 0, /* tp_alloc */ + Dir_new, /* tp_new */ + }; +#else + PyTypeObject smbc_DirType = + { + PyObject_HEAD_INIT(NULL) + 0, /*ob_size*/ + "smbc.Dir", /*tp_name*/ + sizeof(Dir), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + (destructor)Dir_dealloc, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ + "SMBC Dir\n" + "========\n\n" + + " A directory object." + "", /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + Dir_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)Dir_init, /* tp_init */ + 0, /* tp_alloc */ + Dir_new, /* tp_new */ + }; +#endif + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.9/file.c new/pysmbc-1.0.10/file.c --- old/pysmbc-1.0.9/file.c 2010-06-30 09:49:19.000000000 +0200 +++ new/pysmbc-1.0.10/file.c 2010-10-25 16:17:36.000000000 +0200 @@ -2,9 +2,11 @@ * pysmbc - Python bindings for libsmbclient * Copyright (C) 2002, 2005, 2006, 2007, 2008, 2010 Red Hat, Inc * Copyright (C) 2010 Open Source Solution Technology Corporation + * Copyright (C) 2010 Patrick Geltinger <patlkli(a)patlkli.org> * Authors: * Tim Waugh <twaugh(a)redhat.com> * Tsukasa Hamano <hamano(a)osstech.co.jp> + * Patrick Geltinger <patlkli(a)patlkli.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -124,7 +126,7 @@ Py_DECREF ((PyObject *) self->context); } - self->ob_type->tp_free ((PyObject *) self); + Py_TYPE(self)->tp_free ((PyObject *) self); } static PyObject * @@ -160,7 +162,7 @@ free(buf); return NULL; } - ret = PyString_FromStringAndSize(buf, len); + ret = PyUnicode_FromStringAndSize(buf, len); free(buf); return ret; } @@ -183,7 +185,7 @@ pysmbc_SetFromErrno(); return NULL; } - return PyInt_FromLong(len); + return PyLong_FromLong(len); } static PyObject * @@ -226,7 +228,7 @@ ret = (*fn)(ctx->context, self->file); self->file = NULL; } - return PyInt_FromLong(ret); + return PyLong_FromLong(ret); } static PyObject * @@ -247,7 +249,7 @@ fn = smbc_getFunctionRead(ctx->context); len = (*fn)(ctx->context, file->file, buf, 2048); if(len > 0){ - return PyString_FromStringAndSize(buf, len); + return PyUnicode_FromStringAndSize(buf, len); }else if(len == 0){ PyErr_SetNone(PyExc_StopIteration); }else{ @@ -316,49 +318,97 @@ { NULL } /* Sentinel */ }; -PyTypeObject smbc_FileType = - { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ - "smbc.File", /*tp_name*/ - sizeof(File), /*tp_basicsize*/ - 0, /*tp_itemsize*/ - (destructor)File_dealloc, /*tp_dealloc*/ - 0, /*tp_print*/ - 0, /*tp_getattr*/ - 0, /*tp_setattr*/ - 0, /*tp_compare*/ - 0, /*tp_repr*/ - 0, /*tp_as_number*/ - 0, /*tp_as_sequence*/ - 0, /*tp_as_mapping*/ - 0, /*tp_hash */ - 0, /*tp_call*/ - 0, /*tp_str*/ - 0, /*tp_getattro*/ - 0, /*tp_setattro*/ - 0, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT, /*tp_flags*/ - "SMBC File\n" - "=========\n\n" - - " A file object." - "", /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - File_iter, /* tp_iter */ - File_iternext, /* tp_iternext */ - File_methods, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)File_init, /* tp_init */ - 0, /* tp_alloc */ - File_new, /* tp_new */ - }; +#if PY_MAJOR_VERSION >= 3 + PyTypeObject smbc_FileType = + { + PyVarObject_HEAD_INIT(NULL, 0) + "smbc.File", /*tp_name*/ + sizeof(File), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + (destructor)File_dealloc, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_reserved*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ + "SMBC File\n" + "=========\n\n" + + " A file object." + "", /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + File_iter, /* tp_iter */ + File_iternext, /* tp_iternext */ + File_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)File_init, /* tp_init */ + 0, /* tp_alloc */ + File_new, /* tp_new */ + }; +#else + PyTypeObject smbc_FileType = + { + PyObject_HEAD_INIT(NULL) + 0, /*ob_size*/ + "smbc.File", /*tp_name*/ + sizeof(File), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + (destructor)File_dealloc, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ + "SMBC File\n" + "=========\n\n" + + " A file object." + "", /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + File_iter, /* tp_iter */ + File_iternext, /* tp_iternext */ + File_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)File_init, /* tp_init */ + 0, /* tp_alloc */ + File_new, /* tp_new */ + }; +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.9/setup.py new/pysmbc-1.0.10/setup.py --- old/pysmbc-1.0.9/setup.py 2010-07-05 09:44:24.000000000 +0200 +++ new/pysmbc-1.0.10/setup.py 2010-11-01 17:20:01.000000000 +0100 @@ -52,7 +52,7 @@ from distutils.core import setup, Extension setup (name="pysmbc", - version="1.0.9", + version="1.0.10", description="Python bindings for libsmbclient", long_description=__doc__, author=["Tim Waugh <twaugh(a)redhat.com>", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.9/smbcdirent.c new/pysmbc-1.0.10/smbcdirent.c --- old/pysmbc-1.0.9/smbcdirent.c 2010-05-12 05:11:54.000000000 +0200 +++ new/pysmbc-1.0.10/smbcdirent.c 2010-10-25 16:17:36.000000000 +0200 @@ -1,6 +1,7 @@ /* -*- Mode: C; c-file-style: "gnu" -*- * pysmbc - Python bindings for libsmbclient * Copyright (C) 2002, 2005, 2006, 2007, 2008 Tim Waugh <twaugh(a)redhat.com> + * Copyright (C) 2010 Patrick Geltinger <patlkli(a)patlkli.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -84,7 +85,7 @@ { free (self->comment); free (self->name); - self->ob_type->tp_free ((PyObject *) self); + Py_TYPE(self)->tp_free ((PyObject *) self); } static PyObject * @@ -111,25 +112,25 @@ dent->smbc_type <= sizeof (types) ? types[dent->smbc_type] : "?", dent); - return PyString_FromString (s); + return PyUnicode_FromString (s); } static PyObject * Dirent_getName (Dirent *self, void *closure) { - return PyString_FromString (self->name); + return PyUnicode_FromString (self->name); } static PyObject * Dirent_getComment (Dirent *self, void *closure) { - return PyString_FromString (self->comment); + return PyUnicode_FromString (self->comment); } static PyObject * Dirent_getSmbcType (Dirent *self, void *closure) { - return PyInt_FromLong (self->smbc_type); + return PyLong_FromLong (self->smbc_type); } PyGetSetDef Dirent_getseters[] = @@ -149,49 +150,98 @@ { NULL } }; -PyTypeObject smbc_DirentType = - { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ - "smbc.Dirent", /*tp_name*/ - sizeof(Dirent), /*tp_basicsize*/ - 0, /*tp_itemsize*/ - (destructor)Dirent_dealloc, /*tp_dealloc*/ - 0, /*tp_print*/ - 0, /*tp_getattr*/ - 0, /*tp_setattr*/ - 0, /*tp_compare*/ - Dirent_repr, /*tp_repr*/ - 0, /*tp_as_number*/ - 0, /*tp_as_sequence*/ - 0, /*tp_as_mapping*/ - 0, /*tp_hash */ - 0, /*tp_call*/ - 0, /*tp_str*/ - 0, /*tp_getattro*/ - 0, /*tp_setattro*/ - 0, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT, /*tp_flags*/ - "SMBC Dirent\n" - "===========\n\n" - - " A directory entry object." - "", /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - 0, /* tp_methods */ - 0, /* tp_members */ - Dirent_getseters, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)Dirent_init, /* tp_init */ - 0, /* tp_alloc */ - Dirent_new, /* tp_new */ - }; +#if PY_MAJOR_VERSION >= 3 + PyTypeObject smbc_DirentType = + { + PyVarObject_HEAD_INIT(NULL, 0) + "smbc.Dirent", /*tp_name*/ + sizeof(Dirent), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + (destructor)Dirent_dealloc, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_reserved*/ + Dirent_repr, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ + "SMBC Dirent\n" + "=========\n\n" + + " A directory entry object." + "", /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + Dirent_getseters, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)Dirent_init, /* tp_init */ + 0, /* tp_alloc */ + Dirent_new, /* tp_new */ + }; +#else + PyTypeObject smbc_DirentType = + { + PyObject_HEAD_INIT(NULL) + 0, /*ob_size*/ + "smbc.Dirent", /*tp_name*/ + sizeof(Dirent), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + (destructor)Dirent_dealloc, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + Dirent_repr, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ + "SMBC Dirent\n" + "=========\n\n" + + " A directory entry object." + "", /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + Dirent_getseters, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)Dirent_init, /* tp_init */ + 0, /* tp_alloc */ + Dirent_new, /* tp_new */ + }; +#endif + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.9/smbcmodule.c new/pysmbc-1.0.10/smbcmodule.c --- old/pysmbc-1.0.9/smbcmodule.c 2010-07-05 10:06:51.000000000 +0200 +++ new/pysmbc-1.0.10/smbcmodule.c 2010-10-25 16:49:27.000000000 +0200 @@ -2,9 +2,11 @@ * pysmbc - Python bindings for libsmbclient * Copyright (C) 2002, 2005, 2006, 2007, 2008, 2010 Red Hat, Inc * Copyright (C) 2010 Open Source Solution Technology Corporation + * Copyright (C) 2010 Patrick Geltinger <patlkli(a)patlkli.org> * Authors: * Tim Waugh <twaugh(a)redhat.com> * Tsukasa Hamano <hamano(a)osstech.co.jp> + * Patrick Geltinger <patlkli(a)patlkli.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -38,11 +40,29 @@ PyObject *ExistsError; PyObject *NotEmptyError; PyObject *TimedOutError; +PyObject *NoSpaceError; +#if PY_MAJOR_VERSION >= 3 + static struct PyModuleDef smbc_module = { + PyModuleDef_HEAD_INIT, + "smbc", + NULL, + -1, + SmbcMethods + }; + +PyObject * +PyInit_smbc (void) +#else void initsmbc (void) +#endif { - PyObject *m = Py_InitModule ("smbc", SmbcMethods); +#if PY_MAJOR_VERSION >= 3 + PyObject *m = PyModule_Create (&smbc_module); +#else + PyObject *m = Py_InitModule ("smbc", SmbcMethods); +#endif PyObject *d = PyModule_GetDict (m); // Context type @@ -68,7 +88,7 @@ #define INT_CONSTANT(prefix, name) \ do \ { \ - PyObject *val = PyInt_FromLong (prefix##name); \ + PyObject *val = PyLong_FromLong (prefix##name); \ PyDict_SetItemString (d, #name, val); \ Py_DECREF (val); \ } while (0); @@ -102,6 +122,14 @@ TimedOutError = PyErr_NewException("smbc.TimedOutError", NULL, NULL); Py_INCREF(TimedOutError); PyModule_AddObject(m, "TimedOutError", TimedOutError); + + NoSpaceError = PyErr_NewException("smbc.NoSpaceError", NULL, NULL); + Py_INCREF(NoSpaceError); + PyModule_AddObject(m, "NoSpaceError", NoSpaceError); + +#if PY_MAJOR_VERSION >= 3 + return m; +#endif } void pysmbc_SetFromErrno() @@ -128,6 +156,9 @@ case ENOMEM: PyErr_SetFromErrno(PyExc_MemoryError); break; + case ENOSPC: + PyErr_SetFromErrno(NoSpaceError); + break; default: PyErr_SetFromErrno(PyExc_RuntimeError); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pysmbc-1.0.9/tests/test_test.py new/pysmbc-1.0.10/tests/test_test.py --- old/pysmbc-1.0.9/tests/test_test.py 2010-06-03 05:23:02.000000000 +0200 +++ new/pysmbc-1.0.10/tests/test_test.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -#!/usr/bin/env python - -def setUp(): - print "setUp" - pass - -def tearDown(): - print "tearDown" - pass - -def test_003(): - print "003" - pass - -def test_002(): - print "002" - pass - -def test_001(): - print "001" - pass - -print "hello" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tar for openSUSE:Factory
by root＠hilbert.suse.de 10 Nov '10

10 Nov '10

Hello community, here is the log from the commit of package tar for openSUSE:Factory checked in at Wed Nov 10 19:14:18 CET 2010. -------- --- tar/tar.changes 2010-06-28 08:51:21.000000000 +0200 +++ tar/tar.changes 2010-11-09 15:34:28.000000000 +0100 @@ -1,0 +2,23 @@ +Tue Nov 9 13:05:29 UTC 2010 - puzel(a)novell.com + +- update to tar-1.25 + * Fix extraction of empty directories with the -C option in effect. + * Fix extraction of device nodes. + * Make sure name matching occurs before eventual name transformation. + * Fix the behavior of tar -x --overwrite on hosts lacking O_NOFOLLOW. + * Support alternative decompression programs. +- update to tar-1.24 + * The new --full-time option instructs tar to output file + time stamps to the full resolution. + * More reliable directory traversal when creating archives + * When extracting symbolic links, tar now restores attributes + such as last-modified time and link permissions, if the + operating system supports this. + * The --dereference (-h) option now applies to files that are + copied into or out of archives, independently of other options. + * When receiving SIGPIPE, tar would exit with error status and + "write error" diagnostics. +- disable-silent-rules +- updated tar-fortifysourcessigabrt.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- tar-1.23.tar.bz2 New: ---- tar-1.25.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tar.spec ++++++ --- /var/tmp/diff_new_pack.yzrWsL/_old 2010-11-10 19:12:18.000000000 +0100 +++ /var/tmp/diff_new_pack.yzrWsL/_new 2010-11-10 19:12:18.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package tar (Version 1.23) +# spec file for package tar (Version 1.25) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,8 +26,8 @@ Provides: base:/bin/tar PreReq: %install_info_prereq AutoReqProv: on -Version: 1.23 -Release: 2 +Version: 1.25 +Release: 1 Summary: GNU implementation of tar ((t)ape (ar)chiver) Source0: %name-%version.tar.bz2 # @@ -98,9 +98,14 @@ %define my_cflags -W -Wall -Wpointer-arith -Wstrict-prototypes -Wformat-security -Wno-unused-parameter export CFLAGS="$RPM_OPT_FLAGS %my_cflags" export RSH="/usr/bin/rsh" -./configure --prefix=%_prefix --bindir=%_bindir --mandir=%_mandir \ - --infodir=%_infodir --build=%{_target_cpu}-suse-linux \ - --enable-backup-scripts +./configure \ + --prefix=%_prefix \ + --bindir=%_bindir \ + --mandir=%_mandir \ + --infodir=%_infodir \ + --build=%{_target_cpu}-suse-linux \ + --enable-backup-scripts \ + --disable-silent-rules make %{?_smp_mflags}; %check ++++++ tar-1.23.tar.bz2 -> tar-1.25.tar.bz2 ++++++ ++++ 176282 lines of diff (skipped) ++++++ tar-disable-listed02-test.patch ++++++ --- /var/tmp/diff_new_pack.yzrWsL/_old 2010-11-10 19:12:19.000000000 +0100 +++ /var/tmp/diff_new_pack.yzrWsL/_new 2010-11-10 19:12:19.000000000 +0100 @@ -1,12 +1,12 @@ -Index: tar-1.23/tests/testsuite.at +Index: tar-1.25/tests/testsuite.at =================================================================== ---- tar-1.23.orig/tests/testsuite.at -+++ tar-1.23/tests/testsuite.at -@@ -157,7 +157,6 @@ m4_include([incremental.at]) +--- tar-1.25.orig/tests/testsuite.at ++++ tar-1.25/tests/testsuite.at +@@ -172,7 +172,6 @@ m4_include([incremental.at]) m4_include([incr01.at]) m4_include([incr02.at]) m4_include([listed01.at]) -m4_include([listed02.at]) + m4_include([listed03.at]) m4_include([incr03.at]) m4_include([incr04.at]) - m4_include([incr05.at]) ++++++ tar-fortifysourcessigabrt.patch ++++++ --- /var/tmp/diff_new_pack.yzrWsL/_old 2010-11-10 19:12:19.000000000 +0100 +++ /var/tmp/diff_new_pack.yzrWsL/_new 2010-11-10 19:12:19.000000000 +0100 @@ -1,8 +1,8 @@ -Index: tar-1.23/src/create.c +Index: tar-1.25/src/create.c =================================================================== ---- tar-1.23.orig/src/create.c -+++ tar-1.23/src/create.c -@@ -530,8 +530,8 @@ start_private_header (const char *name, +--- tar-1.25.orig/src/create.c ++++ tar-1.25/src/create.c +@@ -517,8 +517,8 @@ start_private_header (const char *name, GID_TO_CHARS (getgid (), header->header.gid); MAJOR_TO_CHARS (0, header->header.devmajor); MINOR_TO_CHARS (0, header->header.devminor); @@ -13,33 +13,7 @@ return header; } -@@ -575,7 +575,10 @@ write_gnu_long_link (struct tar_stat_inf - GNAME_TO_CHARS (tmpname, header->header.gname); - free (tmpname); - -- strcpy (header->header.magic, OLDGNU_MAGIC); -+ /* OLDGNU_MAGIC is string with 7 chars + NULL */ -+ memcpy (header->header.magic, OLDGNU_MAGIC, sizeof(header->header.magic)); -+ memcpy (header->header.version, OLDGNU_MAGIC+sizeof(header->header.magic), -+ sizeof(header->header.version)); - header->header.typeflag = type; - finish_header (st, header, -1); - -@@ -910,15 +913,19 @@ start_header (struct tar_stat_info *st) - break; - - case OLDGNU_FORMAT: -- case GNU_FORMAT: /*FIXME?*/ -- /* Overwrite header->header.magic and header.version in one blow. */ -- strcpy (header->header.magic, OLDGNU_MAGIC); -+ case GNU_FORMAT: -+ /* OLDGNU_MAGIC is string with 7 chars + NULL */ -+ memcpy (header->header.magic, OLDGNU_MAGIC, -+ sizeof(header->header.magic)); -+ memcpy (header->header.version, -+ OLDGNU_MAGIC+sizeof(header->header.magic), -+ sizeof(header->header.version)); - break; +@@ -906,8 +906,8 @@ start_header (struct tar_stat_info *st) case POSIX_FORMAT: case USTAR_FORMAT: ++++++ tar-manpage.patch ++++++ --- /var/tmp/diff_new_pack.yzrWsL/_old 2010-11-10 19:12:19.000000000 +0100 +++ /var/tmp/diff_new_pack.yzrWsL/_new 2010-11-10 19:12:19.000000000 +0100 @@ -1,7 +1,7 @@ -Index: tar-1.23/doc/Makefile.am +Index: tar-1.25/doc/Makefile.am =================================================================== ---- tar-1.23.orig/doc/Makefile.am -+++ tar-1.23/doc/Makefile.am +--- tar-1.25.orig/doc/Makefile.am ++++ tar-1.25/doc/Makefile.am @@ -32,6 +32,9 @@ tar_TEXINFOS = \ sparse.texi\ value.texi @@ -23,10 +23,10 @@ header.texi: $(top_srcdir)/src/tar.h sed -f $(srcdir)/texify.sed $(top_srcdir)/src/tar.h \ | expand >$@ -Index: tar-1.23/Makefile.am +Index: tar-1.25/Makefile.am =================================================================== ---- tar-1.23.orig/Makefile.am -+++ tar-1.23/Makefile.am +--- tar-1.25.orig/Makefile.am ++++ tar-1.25/Makefile.am @@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4 @@ -34,5 +34,5 @@ -SUBDIRS = doc gnu lib rmt src scripts po tests +SUBDIRS = gnu lib rmt src doc scripts po tests - dist-hook: + dist-hook: $(MAKE) changelog_dir=$(distdir) ChangeLog ++++++ tar-wildcards.patch ++++++ --- /var/tmp/diff_new_pack.yzrWsL/_old 2010-11-10 19:12:19.000000000 +0100 +++ /var/tmp/diff_new_pack.yzrWsL/_new 2010-11-10 19:12:19.000000000 +0100 @@ -1,9 +1,9 @@ -Index: tar-1.23/src/names.c +Index: tar-1.25/src/names.c =================================================================== ---- tar-1.23.orig/src/names.c -+++ tar-1.23/src/names.c -@@ -909,10 +909,6 @@ collect_and_sort_names (void) - { +--- tar-1.25.orig/src/names.c ++++ tar-1.25/src/names.c +@@ -970,10 +970,6 @@ collect_and_sort_names (void) + if (name->found_count || name->directory) continue; - if (name->matching_flags & EXCLUDE_WILDCARDS) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 10 Nov '10

10 Nov '10

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Wed Nov 10 19:11:56 CET 2010. -------- --- aaa_base/aaa_base.changes 2010-11-03 13:45:30.000000000 +0100 +++ aaa_base/aaa_base.changes 2010-11-10 16:16:17.000000000 +0100 @@ -1,0 +2,26 @@ +Wed Nov 10 16:15:04 CET 2010 - ro(a)suse.de + +- allow chkconfig to use different root filesystems (bnc#507382) + +------------------------------------------------------------------- +Wed Nov 10 13:16:10 CET 2010 - ro(a)suse.de + +- added service.8 man page from fedora (bnc#621286) + +------------------------------------------------------------------- +Wed Nov 10 13:10:18 CET 2010 - werner(a)suse.de + +- Make /usr/sbin/Check a bash script (bnc#626629) + +------------------------------------------------------------------- +Wed Nov 10 11:27:14 CET 2010 - ro(a)suse.de + +- keep /etc/mtab unchanged if it is a symlink (bnc#651555) + +------------------------------------------------------------------- +Thu Nov 4 15:58:47 UTC 2010 - lnussel(a)suse.de + +- export ONLY_MODULE so modules can act differently when they are called + specifically + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.AHcPmJ/_old 2010-11-10 19:09:35.000000000 +0100 +++ /var/tmp/diff_new_pack.AHcPmJ/_new 2010-11-10 19:09:35.000000000 +0100 @@ -20,7 +20,7 @@ Name: aaa_base Version: 11.4 -Release: 9 +Release: 10 License: GPLv2+ Group: System/Fhs Provides: bin bootutls etc skeleng skelger ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/init.d/boot.rootfsck new/aaa_base/etc/init.d/boot.rootfsck --- old/aaa_base/etc/init.d/boot.rootfsck 2010-05-18 15:38:38.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.rootfsck 2010-11-10 11:26:58.000000000 +0100 @@ -168,9 +168,11 @@ fi fi # start with a clean mtab and enter root fs entry - rm -f /etc/mtab* - > /etc/mtab - mount -f / + if ! test -L /etc/mtab ; then + rm -f /etc/mtab* + > /etc/mtab + mount -f / + fi ;; stop) ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/sbin/SuSEconfig new/aaa_base/sbin/SuSEconfig --- old/aaa_base/sbin/SuSEconfig 2006-02-03 01:15:57.000000000 +0100 +++ new/aaa_base/sbin/SuSEconfig 2010-11-04 16:58:31.000000000 +0100 @@ -184,6 +184,7 @@ echo skipping modules # do nothing, only keep FASTRUN off elif test -n "$ONLY_MODULE" ; then + export ONLY_MODULE if test -f /sbin/conf.d/SuSEconfig.$ONLY_MODULE ; then SUB_SCRIPTS=/sbin/conf.d/SuSEconfig.$ONLY_MODULE else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/sbin/chkconfig new/aaa_base/sbin/chkconfig --- old/aaa_base/sbin/chkconfig 2008-11-20 18:00:55.000000000 +0100 +++ new/aaa_base/sbin/chkconfig 2010-11-10 16:13:21.000000000 +0100 @@ -455,7 +455,7 @@ my $mode = ''; my $printdeps; - +my $root = '/'; sub addmode { die("Please specify only one mode.\n") if $mode; @@ -476,8 +476,9 @@ chkconfig -h|--help (print usage) chkconfig -f|--force ... (call insserv with -f) - chkconfig [name] same as chkconfig -t - chkconfig name state... same as chkconfig -s name state + chkconfig [name] same as chkconfig -t + chkconfig name state... same as chkconfig -s name state + chkconfig --root=<root> ... use <root> as the root file system EOF } @@ -494,7 +495,9 @@ 'level=s' => \$level, 'force|f' => \$force, 'allservices|A' => \$allservices, - 'deps' => \$printdeps + 'deps' => \$printdeps, + 'root=s' => \$root + )) { usage(); exit 1; @@ -507,6 +510,10 @@ my (@remove, $s); my (@enable, $s); +$initdir = "$root/etc/init.d"; +$inetddir = "$root/etc/inetd.d"; +$xinetddir = "$root/etc/xinetd.d"; + findknown(); if (@ARGV) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/usr/sbin/Check new/aaa_base/usr/sbin/Check --- old/aaa_base/usr/sbin/Check 2008-11-05 16:44:33.000000000 +0100 +++ new/aaa_base/usr/sbin/Check 2010-11-10 13:09:40.000000000 +0100 @@ -1,13 +1,12 @@ -#!/bin/sh - -. /etc/profile -. /etc/sysconfig/security +#!/bin/bash --login test "$UID" = 0 -o ! -z "$RPM_BUILD_ROOT" || { echo Check does not work for normal users. exit 1 } +. /etc/sysconfig/security + do_gzip() { while read input; do if test -f "$input.gz"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/usr/share/man/man8/service.8 new/aaa_base/usr/share/man/man8/service.8 --- old/aaa_base/usr/share/man/man8/service.8 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base/usr/share/man/man8/service.8 2010-11-10 13:15:51.000000000 +0100 @@ -0,0 +1,39 @@ +.\"$Id:$ +.TH service 8 "Jan 2006" +.SH NAME +service \- run a System V init script +.SH SYNOPSIS + service \fBSCRIPT\fR \fBCOMMAND\fR [\fBOPTIONS\fR] +.br + service --status-all +.br + service --help | -h | --version + +.SH DESCRIPTION +service runs a System V init script in as predictable environment as +possible, removing most environment variables and with current working +directory set to /. +.PP +The \fBSCRIPT\fR parameter specifies a System V init script, located in +/etc/init.d/\fBSCRIPT\fR. The supported values of \fBCOMMAND\fR depend on the +invoked script, service passes \fBCOMMAND\fR and \fBOPTIONS\fR it to the init +script unmodified. All scripts should support at least the start and +stop commands. As a special case, if \fBCOMMAND\fR is \-\-full-restart, the +script is run twice, first with the stop command, then with the start +command. + +service \-\-status-all runs all init scripts, in alphabetical order, with +the status command. +.SH FILES +/etc/init.d + The directory containing System V init scripts. +.BR +.SH ENVIRONMENT +LANG, +TERM + The only environment variables passed to the init scripts. +.BR +.SH "SEE ALSO" +chkconfig(8), +ntsysv(8) +.BR ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit squashfs for openSUSE:Factory
by root＠hilbert.suse.de 10 Nov '10

10 Nov '10

Hello community, here is the log from the commit of package squashfs for openSUSE:Factory checked in at Wed Nov 10 19:09:10 CET 2010. -------- --- squashfs/squashfs.changes 2009-09-21 14:47:24.000000000 +0200 +++ squashfs/squashfs.changes 2010-11-02 19:42:28.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Nov 2 18:41:08 UTC 2010 - coolo(a)novell.com + +- update to 4.1 + - support for lzo (>= 2.6.36) and lzma (not yet mainline) + - xattr support + - misc fixes for the tools + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- squashfs-retval.patch squashfs4.0.tar.gz New: ---- squashfs4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squashfs.spec ++++++ --- /var/tmp/diff_new_pack.kV58IZ/_old 2010-11-10 19:08:34.000000000 +0100 +++ /var/tmp/diff_new_pack.kV58IZ/_new 2010-11-10 19:08:34.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package squashfs (Version 4.0) +# spec file for package squashfs (Version 4.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,14 +19,13 @@ Name: squashfs -BuildRequires: zlib-devel +BuildRequires: attr-devel zlib-devel License: GPLv2+ Group: System/Filesystems Supplements: filesystem(squashfs) -Version: 4.0 +Version: 4.1 Release: 1 -Source0: squashfs4.0.tar.gz -Patch: squashfs-retval.patch +Source0: squashfs4.1.tar.gz Url: http://squashfs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Read-Only File System with Efficient Compression @@ -35,18 +34,12 @@ This package contains the userland utilities to create and read squashfs images. - - -Authors: --------- - Phillip Lougher - %prep %setup -n squashfs%{version} -%patch -p0 %build -make -C squashfs-tools CFLAGS="-I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $RPM_OPT_FLAGS" +sed -i -e "s,-O2,%{optflags}," squashfs-tools/Makefile +make -C squashfs-tools %install mkdir -p $RPM_BUILD_ROOT/usr/bin @@ -57,7 +50,7 @@ %files %defattr(-,root,root) -%doc README README-4.0 PERFORMANCE.README CHANGES +%doc README README-%version PERFORMANCE.README CHANGES /usr/bin/*squashfs %changelog ++++++ squashfs4.0.tar.gz -> squashfs4.1.tar.gz ++++++ ++++ 10150 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xiterm for openSUSE:Factory
by root＠hilbert.suse.de 10 Nov '10

10 Nov '10

Hello community, here is the log from the commit of package xiterm for openSUSE:Factory checked in at Wed Nov 10 19:08:18 CET 2010. -------- --- xiterm/xiterm.changes 2010-09-09 20:43:42.000000000 +0200 +++ xiterm/xiterm.changes 2010-11-08 15:40:17.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 8 14:40:09 UTC 2010 - coolo(a)novell.com + +- remove support for pre-9.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xiterm.spec ++++++ --- /var/tmp/diff_new_pack.olKQnN/_old 2010-11-10 19:07:54.000000000 +0100 +++ /var/tmp/diff_new_pack.olKQnN/_new 2010-11-10 19:07:54.000000000 +0100 @@ -24,21 +24,15 @@ %else BuildRequires: utempter %endif -%if "%(xft-config --prefix)" == "/usr" %define appdefdir /usr/share/X11 %define xincludes /usr/include %define xlibraries /usr/%{_lib} -%else -%define appdefdir /usr/X11R6/lib/X11 -%define xincludes /usr/X11R6/include -%define xlibraries /usr/X11R6/%{_lib} -%endif License: IBM Public License .. Group: System/X11/Terminals AutoReqProv: on Provides: locale(xorg-x11:ja;ko;zh) Version: 0.5.20040304 -Release: 269 +Release: 270 # cvs -d:pserver:anonymous@www.openi18n.org:/cvsroot login (no password to login) # cvs -d:pserver:anonymous@www.openi18n.org:/cvsroot co iterm # tar jcvf iterm-0.5.20040304.tar.bz2 iterm @@ -59,12 +53,6 @@ %description Internationalized Terminal Emulator for X11 - - -Authors: --------- - Jiro SEKIBA <jir(a)yamato.ibm.com> - %package -n fbiterm License: IBM Public License .. Summary: Internationalized Terminal Emulator for Framebuffers @@ -74,13 +62,6 @@ %description -n fbiterm An internationalized terminal emulator for framebuffers. - - -Authors: --------- - Jiro SEKIBA <jir(a)yamato.ibm.com> - WASHIZAWA Masahide <washi(a)jp.ibm.com> - %package -n gtkiterm License: IBM Public License .. Summary: Internationalized Terminal Emulator for GTK @@ -90,12 +71,6 @@ %description -n gtkiterm An internationalized terminal emulator for GTK. - - -Authors: --------- - Jiro SEKIBA <jir(a)yamato.ibm.com> - %package -n libiterm License: IBM Public License .. Group: System/Libraries @@ -107,12 +82,6 @@ like a drawing string on specific column and row, or set fore/background color and so on. - - -Authors: --------- - Jiro SEKIBA <jir(a)yamato.ibm.com> - %package -n libiterm-devel License: IBM Public License .. Summary: Header files and development libraries for libiterm @@ -122,12 +91,6 @@ %description -n libiterm-devel Header files and development libraries for libiterm - - -Authors: --------- - Jiro SEKIBA <jir(a)yamato.ibm.com> - %package -n libXiterm License: IBM Public License .. Group: System/Libraries @@ -136,12 +99,6 @@ %description -n libXiterm Terminal emulator Xaw widget library based on libiterm - - -Authors: --------- - Jiro SEKIBA <jir(a)yamato.ibm.com> - %package -n libXiterm-devel License: IBM Public License .. Summary: Header files and development libraries for libXiterm @@ -151,12 +108,6 @@ %description -n libXiterm-devel Header files and development libraries for libXiterm - - -Authors: --------- - Jiro SEKIBA <jir(a)yamato.ibm.com> - %prep %setup0 -q -n iterm -a 1 %patch0 -p 1 -b .fontset ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-input for openSUSE:Factory
by root＠hilbert.suse.de 10 Nov '10

10 Nov '10

Hello community, here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory checked in at Wed Nov 10 19:07:33 CET 2010. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-10-30 21:42:01.000000000 +0200 +++ xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-11-08 16:03:54.000000000 +0100 @@ -1,0 +2,19 @@ +Mon Nov 8 14:57:59 UTC 2010 - sndirsch(a)novell.com + +- merged xf86-input-vmmouse-iopl.diff/ + xf86-input-vmmouse-iopl-driver.diff and removed fprintfs + +------------------------------------------------------------------- +Sun Nov 7 21:14:34 UTC 2010 - sndirsch(a)novell.com + +- xf86-input-vmmouse-iopl-driver.diff + * Use fprintf(...) instead of VMwareLog((...)) for debug messages. + +------------------------------------------------------------------- +Sun Nov 7 12:05:53 UTC 2010 - sndirsch(a)novell.com + +- xf86-input-vmmouse-iopl-driver.diff + * switch to I/O privilege level 3 also for the driver itself + (bnc #625041) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.YhiInj/_old 2010-11-10 18:58:47.000000000 +0100 +++ /var/tmp/diff_new_pack.YhiInj/_new 2010-11-10 18:58:47.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel pkgconfig udev xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 16 +Release: 17 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -117,7 +117,7 @@ rm -rf xf86-input-vmmouse* %else pushd xf86-input-vmmouse-* -%patch47 -p1 -R +%patch47 -p1 %endif %build ++++++ xf86-input-vmmouse-iopl.diff ++++++ --- /var/tmp/diff_new_pack.YhiInj/_old 2010-11-10 18:58:47.000000000 +0100 +++ /var/tmp/diff_new_pack.YhiInj/_new 2010-11-10 18:58:47.000000000 +0100 @@ -1,22 +1,67 @@ -commit bcdec3d0cd4434770cd841c33c030e0d7203881f -Author: Philip Langdale <philipl(a)fido2.homeip.net> -Date: Thu Oct 23 23:35:28 2008 -0700 - - Remove call to iopl(). It's not portable and isn't necessary. - -diff --git a/tools/vmmouse_detect.c b/tools/vmmouse_detect.c -index e5f14a3..0dd4827 100644 ---- a/tools/vmmouse_detect.c -+++ b/tools/vmmouse_detect.c -@@ -47,11 +47,6 @@ main(void) - signal(SIGSEGV, segvCB); - - #if defined __i386__ || defined __x86_64__ -- /* -- * To access i/o ports above 0x3ff, we need to be in iopl(3). -- */ -- -- iopl(3); - if (VMMouseClient_Enable()) { - VMMouseClient_Disable(); - return 0; +diff --git a/shared/vmmouse_proto.c b/shared/vmmouse_proto.c +index b50e071..263bb36 100644 +--- a/shared/vmmouse_proto.c ++++ b/shared/vmmouse_proto.c +@@ -33,6 +33,7 @@ + */ + + ++#include <sys/io.h> + #include "vmmouse_proto.h" + + +@@ -119,6 +120,31 @@ VMMouseProtoInOut(VMMouseProtoCmd *cmd) // IN/OUT + #endif + } + ++/* ++ *----------------------------------------------------------------------------- ++ * ++ * VMMouseGetIOPL -- ++ * ++ * Helper to figure out the current I/O privilege level (idea by ++ * Jiri Kosina <jkosina(a)suse.cz>) ++ * ++ * Results: ++ * Returns I/O privilege level ++ * ++ * Side effects: ++ * None ++ * ++ *----------------------------------------------------------------------------- ++ */ ++ ++int ++VMMouseGetIOPL() ++{ ++ unsigned long eflags; ++ ++ asm ("pushf\n\tpop %0" : "=r" (eflags)); ++ return (eflags >> 12) & 3; ++} + + /* + *----------------------------------------------------------------------------- +@@ -140,8 +166,22 @@ VMMouseProtoInOut(VMMouseProtoCmd *cmd) // IN/OUT + void + VMMouseProto_SendCmd(VMMouseProtoCmd *cmd) // IN/OUT + { ++ int cpl; ++ + cmd->in.magic = VMMOUSE_PROTO_MAGIC; + cmd->in.port = VMMOUSE_PROTO_PORT; + ++#if defined __i386__ || defined __x86_64__ ++ cpl = VMMouseGetIOPL(); ++ /* ++ * To access i/o ports above 0x3ff, we need to be in iopl(3). ++ */ ++ iopl(3); ++#endif ++ + VMMouseProtoInOut(cmd); ++ ++#if defined __i386__ || defined __x86_64__ ++ iopl(cpl); ++#endif + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video for openSUSE:Factory
by root＠hilbert.suse.de 10 Nov '10

10 Nov '10

Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Wed Nov 10 18:58:28 CET 2010. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-11-06 01:23:54.000000000 +0100 +++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-11-09 17:37:43.000000000 +0100 @@ -1,0 +2,26 @@ +Tue Nov 9 15:15:03 UTC 2010 - sndirsch(a)novell.com + +- xf86-video-vmware 11.0.3 + * This is a bugfix release that addresses a number of bugs as + well as build failures on Servers 1.0 through 1.9 + +------------------------------------------------------------------- +Tue Nov 9 10:11:22 UTC 2010 - sndirsch(a)novell.com + +- xf86-video-geode 2.11.10 + * fix the DCON verification loop for LX output + * Add get_crtc output function + * Don't power down DCON when it is frozen + * Replace xalloc/xrealloc/xfree/xcalloc with malloc/realloc/free/ + calloc + * Mode Validation support on modeline in xorg.conf + * Fix a typo on resolution parameter + * Add resolution 1024x600 support for PANEL + * Revise the entry for 1024x600 + * Simplify the mode_valid function + * Modify rotation pitch & reallocate pixmap for bo + * Allocate video memory with exaOffscreenAlloc + * Revert "Simplify the mode_valid function" + * lx_display: fix typo + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-video-geode-2.11.9.tar.bz2 xf86-video-vmware-11.0.2.tar.bz2 New: ---- xf86-video-geode-2.11.10.tar.bz2 xf86-video-vmware-11.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.wWpRB0/_old 2010-11-10 18:48:57.000000000 +0100 +++ /var/tmp/diff_new_pack.wWpRB0/_new 2010-11-10 18:48:57.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 29 +Release: 30 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -63,12 +63,12 @@ Source36: xf86-video-tseng-1.2.4.tar.bz2 Source37: xf86-video-v4l-0.2.0.tar.bz2 Source38: xf86-video-vesa-2.3.0.tar.bz2 -Source41: xf86-video-vmware-11.0.2.tar.bz2 +Source41: xf86-video-vmware-11.0.3.tar.bz2 Source42: xf86-video-voodoo-1.2.4.tar.bz2 Source44: HALlib-4.1.tar.gz Source45: xf86-video-intel-2.13.901.tar.bz2 Source46: xf86-video-ati-6.13.2.tar.bz2 -Source51: xf86-video-geode-2.11.9.tar.bz2 +Source51: xf86-video-geode-2.11.10.tar.bz2 Source54: xf86-video-mach64-6.8.2.tar.bz2 Source55: xf86-video-r128-6.8.1.tar.bz2 Source56: intel-gpu-tools-1.0.2-20100825-c935c60.tar.bz2 ++++++ xf86-video-geode-2.11.9.tar.bz2 -> xf86-video-geode-2.11.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/ChangeLog new/xf86-video-geode-2.11.10/ChangeLog --- old/xf86-video-geode-2.11.9/ChangeLog 2010-08-23 07:11:13.000000000 +0200 +++ new/xf86-video-geode-2.11.10/ChangeLog 2010-11-09 10:22:28.000000000 +0100 @@ -1,3 +1,161 @@ +commit 50f9152e2087fd50dfc09e35505c2fbcdd3183b0 +Author: Martin-Éric Racine <q-funk(a)iki.fi> +Date: Tue Nov 9 11:12:44 2010 +0200 + + Geode 2.11.10 + +commit ff091333b506855c17ec8ea5f933026221600be9 +Author: Martin-Éric Racine <q-funk(a)iki.fi> +Date: Thu Oct 28 13:13:09 2010 +0300 + + Revert "Simplify the mode_valid function" + + This reverts commit fab58e111b6655602b4f739260a01247ff478f35. + +commit fab58e111b6655602b4f739260a01247ff478f35 +Author: Huang, FrankR <FrankR.Huang(a)amd.com> +Date: Thu Oct 28 15:17:19 2010 +0800 + + Simplify the mode_valid function + + Signed-off-by: Frank Huang<frankr.huang(a)amd.com> + +commit fb72a210d7de61c49fc66aafa057d8c6a028b907 +Author: Huang, FrankR <FrankR.Huang(a)amd.com> +Date: Thu Oct 28 15:16:58 2010 +0800 + + Revise the entry for 1024x600 + + *Change the entry of 1024x600 from 3 to 7(That will not affect the entries from + 3 to 6). And BIOS should set the VG_FP_TYPE bit[5:3] to 7. + *Use 1024x600@80 instead of 1024x600@60 parameters to support more 4:3 resolutions + + Signed-off-by: Frank Huang<frankr.huang(a)amd.com> + +commit 9caaf7f8294ef9700e9e20e394fee10cc2b1c9c0 +Author: Daniel Drake <dsd(a)laptop.org> +Date: Mon Sep 6 18:35:17 2010 -0600 + + Don't power down DCON when it is frozen + + Putting a frozen DCON to sleep (as happens during regular boot of the XO) + will cause the frozen image to be corrupted. + + Change the behaviour to only sleep when the DCON is not frozen. + + http://dev.laptop.org/ticket/10196 + +commit 87512b72d64370e062d209724994a72368c21df6 +Author: Daniel Drake <dsd(a)laptop.org> +Date: Mon Sep 6 18:33:48 2010 -0600 + + Add get_crtc output function + + I don't know why X can't do this itself, but when no get_crtc method is + provided, X decides that it doesn't know the CRTC of the output and + decides to reset the mode completely (causing display powerdown, resulting + in an uncomfortable visual interruption to OLPC's boot process). + +commit 5e72a00ad26f2052bb48fef041d6fbd14ba18153 +Author: Hunk Cui <Hunk.Cui(a)amd.com> +Date: Wed Oct 13 18:26:52 2010 +0800 + + Allocate video memory with exaOffscreenAlloc + + *Del for deduct the probable size of a video overlay. + *Use exaOffscreenAlloc allocate the video overlay. + *Use exaOffscreenAlloc allocate the offscreen surface. + *XV-video data has to be allocate in offscreen memory range. + + Signed-off-by: Hunk Cui <Hunk.Cui(a)amd.com> + +commit 334534cde47f1ffe126e4e665988480fc57a7307 +Author: Frank Huang <frankr.huang(a)amd.com> +Date: Wed Sep 29 16:45:56 2010 +0800 + + Add resolution 1024x600 support for PANEL + + *Users can not get 1024x600 by default when using panel without xorg.conf. + Add this screen resolution to the panel_modes table to support it by default. + *Users who are using VGA will get this resolution by the monitor EDID. No + code is needed + *Use gtf tool to get the parameters + *Ubuntu bugzilla #433142 + + Signed-off-by: Frank Huang <frankr.huang(a)amd.com> + +commit becaa0ae375e996c2f83192bb84a5c89f94933dd +Author: Frank Huang <frankr.huang(a)amd.com> +Date: Wed Sep 29 16:45:42 2010 +0800 + + Fix a typo on resolution parameter + + *change from 1028 to 1280 + + Signed-off-by: Frank Huang <frankr.huang(a)amd.com> + +commit 89c60efe899f0cda4a52e0574f030c021c4b1ece +Author: Frank Huang <frankr.huang(a)amd.com> +Date: Wed Sep 29 16:35:46 2010 +0300 + + Mode Validation support on modeline in xorg.conf + + *mode validation(lx_output_mode_valid) in this driver should return MODE_OK for + all modes filtered out by previous process in this function. Otherwise, new + modelines(conf_modes) will be pruned by Xserver function Xf86PruneInvalidModes. + The result is that the user can not set arbitrary resolutions. We comply with + the code of ATI&&Intel mode_valid function to do this. + *For modes that cannot be supported by the geode driver, it is better to give + the specific MODE_XXX(such as MODE_CLOCK_RANGE) instead of MODE_BAD. + + Signed-off-by: Frank Huang <frankr.huang(a)amd.com> + +commit 74e28b83d5b725a134aad264771a7c9a4d0e38df +Author: Hunk <hunk.cui(a)amd.com> +Date: Sun Sep 26 18:14:52 2010 +0800 + + Modify rotation pitch & reallocate pixmap for bo + + *Modify rotation pitch value with crtc_mode_set. + *Use own wrapper to allocate a pixmap for wrapping a bo. + *Ubuntu Bugzilla #377929 + *Debian Bugzilla #512020 + + Signed-off-by: Hunk Cui <Hunk.Cui(a)amd.com> + +commit 7d7cc26011fde18dcce5c6b95cd73a12a71a7f99 +Author: Otavio Salvador <otavio(a)ossystems.com.br> +Date: Thu Sep 23 16:17:40 2010 -0300 + + lx_display: fix typo + +commit 90dda28842ac76a05ae75a4fdd457dd8b8988950 +Author: Andres Salomon <dilinger(a)queued.net> +Date: Mon Sep 20 11:31:29 2010 -0700 + + fix the DCON verification loop for LX output + + This is pretty clearly a bug. This should fix it (after all, that + check is merely to see if the panel is a DCON; we don't care at + all about the panel bit). This also adds an extra parenthesis in + the following if() statement for clarity. + + I'm resisting the temptation to change GeodeRec's Output member to + an unsigned long (for now). Bitfields should really be unsigned. + + Signed-off-by: Andres Salomon <dilinger(a)queued.net> + +commit 5dfe7dbf6ed122fbbb758be7a5b7d78a199583c7 +Author: Frank Huang <frankr.huang(a)amd.com> +Date: Wed Sep 1 10:30:35 2010 +0800 + + Replace xalloc/xrealloc/xfree/xcalloc with malloc/realloc/free/calloc + + * Replace the deprecated functions with new ones + Refer to "/xserver/include/os.h" + + Signed-off-by: Frank Huang <frankr.huang(a)amd.com> + commit fc342655a3d928759467eac8c917effe8f283031 Author: Martin-Éric Racine <q-funk(a)iki.fi> Date: Mon Aug 23 07:46:22 2010 +0300 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/aclocal.m4 new/xf86-video-geode-2.11.10/aclocal.m4 --- old/xf86-video-geode-2.11.9/aclocal.m4 2010-08-23 07:07:14.000000000 +0200 +++ new/xf86-video-geode-2.11.10/aclocal.m4 2010-11-09 10:21:06.000000000 +0100 @@ -8122,7 +8122,7 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])dnl +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -8133,7 +8133,7 @@ _PKG_TEXT -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -8145,7 +8145,7 @@ dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl -dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. +dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), @@ -8182,7 +8182,7 @@ # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.10.0]) +m4_define([vers_have], [1.11.0]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -8333,6 +8333,7 @@ -e 's|__xservername__|Xorg|g' \ -e 's|__xconfigfile__|xorg.conf|g' \ -e 's|__projectroot__|\$(prefix)|g' \ + -e 's|__apploaddir__|\$(appdefaultdir)|g' \ -e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \ -e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \ -e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \ @@ -8490,15 +8491,17 @@ AC_SUBST(MAKE_HTML) ]) # XORG_CHECK_DOCBOOK -# XORG_WITH_XMLTO([MIN-VERSION]) +# XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT]) # ---------------- # Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-xmlto option, it allows maximum flexibilty in making decisions -# as whether or not to use the xmlto package. +# as whether or not to use the xmlto package. When DEFAULT is not specified, +# --with-xmlto assumes 'auto'. # # Interface to module: # HAVE_XMLTO: used in makefiles to conditionally generate documentation @@ -8515,10 +8518,12 @@ # AC_DEFUN([XORG_WITH_XMLTO],[ AC_ARG_VAR([XMLTO], [Path to xmlto command]) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(xmlto, AS_HELP_STRING([--with-xmlto], - [Use xmlto to regenerate documentation (default: yes, if installed)]), - [use_xmlto=$withval], [use_xmlto=auto]) + [Use xmlto to regenerate documentation (default: ]_defopt[)]), + [use_xmlto=$withval], [use_xmlto=]_defopt) +m4_undefine([_defopt]) if test "x$use_xmlto" = x"auto"; then AC_PATH_PROG([XMLTO], [xmlto]) @@ -8572,15 +8577,17 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) ]) # XORG_WITH_XMLTO -# XORG_WITH_ASCIIDOC([MIN-VERSION]) +# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT]) # ---------------- # Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-asciidoc option, it allows maximum flexibilty in making decisions -# as whether or not to use the asciidoc package. +# as whether or not to use the asciidoc package. When DEFAULT is not specified, +# --with-asciidoc assumes 'auto'. # # Interface to module: # HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation @@ -8593,10 +8600,12 @@ # AC_DEFUN([XORG_WITH_ASCIIDOC],[ AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command]) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(asciidoc, AS_HELP_STRING([--with-asciidoc], - [Use asciidoc to regenerate documentation (default: yes, if installed)]), - [use_asciidoc=$withval], [use_asciidoc=auto]) + [Use asciidoc to regenerate documentation (default: ]_defopt[)]), + [use_asciidoc=$withval], [use_asciidoc=]_defopt) +m4_undefine([_defopt]) if test "x$use_asciidoc" = x"auto"; then AC_PATH_PROG([ASCIIDOC], [asciidoc]) @@ -8637,15 +8646,17 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) ]) # XORG_WITH_ASCIIDOC -# XORG_WITH_DOXYGEN([MIN-VERSION]) +# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT]) # -------------------------------- # Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-doxygen option, it allows maximum flexibilty in making decisions -# as whether or not to use the doxygen package. +# as whether or not to use the doxygen package. When DEFAULT is not specified, +# --with-doxygen assumes 'auto'. # # Interface to module: # HAVE_DOXYGEN: used in makefiles to conditionally generate documentation @@ -8658,10 +8669,12 @@ # AC_DEFUN([XORG_WITH_DOXYGEN],[ AC_ARG_VAR([DOXYGEN], [Path to doxygen command]) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(doxygen, AS_HELP_STRING([--with-doxygen], - [Use doxygen to regenerate documentation (default: yes, if installed)]), - [use_doxygen=$withval], [use_doxygen=auto]) + [Use doxygen to regenerate documentation (default: ]_defopt[)]), + [use_doxygen=$withval], [use_doxygen=]_defopt) +m4_undefine([_defopt]) if test "x$use_doxygen" = x"auto"; then AC_PATH_PROG([DOXYGEN], [doxygen]) @@ -8702,15 +8715,17 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) ]) # XORG_WITH_DOXYGEN -# XORG_WITH_GROFF +# XORG_WITH_GROFF([DEFAULT]) # ---------------- # Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-groff option, it allows maximum flexibilty in making decisions -# as whether or not to use the groff package. +# as whether or not to use the groff package. When DEFAULT is not specified, +# --with-groff assumes 'auto'. # # Interface to module: # HAVE_GROFF: used in makefiles to conditionally generate documentation @@ -8739,10 +8754,12 @@ # AC_DEFUN([XORG_WITH_GROFF],[ AC_ARG_VAR([GROFF], [Path to groff command]) +m4_define([_defopt], m4_default([$1], [auto])) AC_ARG_WITH(groff, AS_HELP_STRING([--with-groff], - [Use groff to regenerate documentation (default: yes, if installed)]), - [use_groff=$withval], [use_groff=auto]) + [Use groff to regenerate documentation (default: ]_defopt[)]), + [use_groff=$withval], [use_groff=]_defopt) +m4_undefine([_defopt]) if test "x$use_groff" = x"auto"; then AC_PATH_PROG([GROFF], [groff]) @@ -8805,15 +8822,17 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) ]) # XORG_WITH_GROFF -# XORG_WITH_FOP +# XORG_WITH_FOP([DEFAULT]) # ---------------- # Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-fop option, it allows maximum flexibilty in making decisions -# as whether or not to use the fop package. +# as whether or not to use the fop package. When DEFAULT is not specified, +# --with-fop assumes 'auto'. # # Interface to module: # HAVE_FOP: used in makefiles to conditionally generate documentation @@ -8826,10 +8845,12 @@ # AC_DEFUN([XORG_WITH_FOP],[ AC_ARG_VAR([FOP], [Path to fop command]) +m4_define([_defopt], m4_default([$1], [auto])) AC_ARG_WITH(fop, AS_HELP_STRING([--with-fop], - [Use fop to regenerate documentation (default: yes, if installed)]), - [use_fop=$withval], [use_fop=auto]) + [Use fop to regenerate documentation (default: ]_defopt[)]), + [use_fop=$withval], [use_fop=]_defopt) +m4_undefine([_defopt]) if test "x$use_fop" = x"auto"; then AC_PATH_PROG([FOP], [fop]) @@ -8856,15 +8877,17 @@ AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) ]) # XORG_WITH_FOP -# XORG_WITH_PS2PDF +# XORG_WITH_PS2PDF([DEFAULT]) # ---------------- # Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-ps2pdf option, it allows maximum flexibilty in making decisions -# as whether or not to use the ps2pdf package. +# as whether or not to use the ps2pdf package. When DEFAULT is not specified, +# --with-ps2pdf assumes 'auto'. # # Interface to module: # HAVE_PS2PDF: used in makefiles to conditionally generate documentation @@ -8877,10 +8900,12 @@ # AC_DEFUN([XORG_WITH_PS2PDF],[ AC_ARG_VAR([PS2PDF], [Path to ps2pdf command]) +m4_define([_defopt], m4_default([$1], [auto])) AC_ARG_WITH(ps2pdf, AS_HELP_STRING([--with-ps2pdf], - [Use ps2pdf to regenerate documentation (default: yes, if installed)]), - [use_ps2pdf=$withval], [use_ps2pdf=auto]) + [Use ps2pdf to regenerate documentation (default: ]_defopt[)]), + [use_ps2pdf=$withval], [use_ps2pdf=]_defopt) +m4_undefine([_defopt]) if test "x$use_ps2pdf" = x"auto"; then AC_PATH_PROG([PS2PDF], [ps2pdf]) @@ -8931,14 +8956,12 @@ # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_DOCS],[ -default=$1 -if test "x$default" = x ; then - default="yes" -fi +m4_define([default], m4_default([$1], [yes])) AC_ARG_ENABLE(docs, AS_HELP_STRING([--enable-docs], - [Enable building the documentation (default: yes)]), - [build_docs=$enableval], [build_docs=$default]) + [Enable building the documentation (default: ]default[)]), + [build_docs=$enableval], [build_docs=]default) +m4_undefine([default]) AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes]) AC_MSG_CHECKING([whether to build documentation]) AC_MSG_RESULT([$build_docs]) @@ -8966,14 +8989,12 @@ # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[ -devel_default=$1 -if test "x$devel_default" = x ; then - devel_default="yes" -fi +m4_define([devel_default], m4_default([$1], [yes])) AC_ARG_ENABLE(devel-docs, AS_HELP_STRING([--enable-devel-docs], - [Enable building the developer documentation (default: yes)]), - [build_devel_docs=$enableval], [build_devel_docs=$devel_default]) + [Enable building the developer documentation (default: ]devel_default[)]), + [build_devel_docs=$enableval], [build_devel_docs=]devel_default) +m4_undefine([devel_default]) AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes]) AC_MSG_CHECKING([whether to build developer documentation]) AC_MSG_RESULT([$build_devel_docs]) @@ -9001,14 +9022,12 @@ # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_SPECS],[ -spec_default=$1 -if test "x$spec_default" = x ; then - spec_default="yes" -fi +m4_define([spec_default], m4_default([$1], [yes])) AC_ARG_ENABLE(specs, AS_HELP_STRING([--enable-specs], - [Enable building the specs (default: yes)]), - [build_specs=$enableval], [build_specs=$spec_default]) + [Enable building the specs (default: ]spec_default[)]), + [build_specs=$enableval], [build_specs=]spec_default) +m4_undefine([spec_default]) AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes]) AC_MSG_CHECKING([whether to build functional specifications]) AC_MSG_RESULT([$build_specs]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/configure new/xf86-video-geode-2.11.10/configure --- old/xf86-video-geode-2.11.9/configure 2010-08-23 07:07:29.000000000 +0200 +++ new/xf86-video-geode-2.11.10/configure 2010-11-09 10:21:23.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for xf86-video-geode 2.11.9. +# Generated by GNU Autoconf 2.67 for xf86-video-geode 2.11.10. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2F…>. # @@ -702,8 +702,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-geode' PACKAGE_TARNAME='xf86-video-geode' -PACKAGE_VERSION='2.11.9' -PACKAGE_STRING='xf86-video-geode 2.11.9' +PACKAGE_VERSION='2.11.10' +PACKAGE_STRING='xf86-video-geode 2.11.10' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2F…' PACKAGE_URL='http://www.x.org/wiki/GeodeDriver' @@ -1476,7 +1476,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-video-geode 2.11.9 to adapt to many kinds of systems. +\`configure' configures xf86-video-geode 2.11.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1547,7 +1547,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-geode 2.11.9:";; + short | recursive ) echo "Configuration of xf86-video-geode 2.11.10:";; esac cat <<\_ACEOF @@ -1675,7 +1675,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-video-geode configure 2.11.9 +xf86-video-geode configure 2.11.10 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1999,7 +1999,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-video-geode $as_me 2.11.9, which was +It was created by xf86-video-geode $as_me 2.11.10, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -4296,6 +4296,7 @@ -e 's|__xservername__|Xorg|g' \ -e 's|__xconfigfile__|xorg.conf|g' \ -e 's|__projectroot__|\$(prefix)|g' \ + -e 's|__apploaddir__|\$(appdefaultdir)|g' \ -e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \ -e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \ -e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \ @@ -4726,7 +4727,7 @@ # Define the identity of the package. PACKAGE='xf86-video-geode' - VERSION='2.11.9' + VERSION='2.11.10' cat >>confdefs.h <<_ACEOF @@ -5429,13 +5430,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5432: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5433: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5435: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5436: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5438: output\"" >&5) + (eval echo "\"\$as_me:5439: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6640,7 +6641,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6643 "configure"' > conftest.$ac_ext + echo '#line 6644 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7868,11 +7869,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7871: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7872: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7875: \$? = $ac_status" >&5 + echo "$as_me:7876: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8207,11 +8208,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8210: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8211: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8214: \$? = $ac_status" >&5 + echo "$as_me:8215: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8312,11 +8313,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8315: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8316: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8319: \$? = $ac_status" >&5 + echo "$as_me:8320: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8367,11 +8368,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8370: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8371: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8374: \$? = $ac_status" >&5 + echo "$as_me:8375: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10751,7 +10752,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10754 "configure" +#line 10755 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10847,7 +10848,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10850 "configure" +#line 10851 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12932,7 +12933,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-video-geode $as_me 2.11.9, which was +This file was extended by xf86-video-geode $as_me 2.11.10, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12999,7 +13000,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xf86-video-geode config.status 2.11.9 +xf86-video-geode config.status 2.11.10 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/configure.ac new/xf86-video-geode-2.11.10/configure.ac --- old/xf86-video-geode-2.11.9/configure.ac 2010-08-23 07:06:51.000000000 +0200 +++ new/xf86-video-geode-2.11.10/configure.ac 2010-11-09 10:20:07.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.59) AC_INIT([xf86-video-geode], - [2.11.9], + [2.11.10], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2F…] [xf86-video-geode], [http://www.x.org/wiki/GeodeDriver] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/geode_dcon.c new/xf86-video-geode-2.11.10/src/geode_dcon.c --- old/xf86-video-geode-2.11.9/src/geode_dcon.c 2010-08-23 07:06:51.000000000 +0200 +++ new/xf86-video-geode-2.11.10/src/geode_dcon.c 2010-11-09 10:20:07.000000000 +0100 @@ -37,6 +37,7 @@ #include <fcntl.h> #define DCON_SLEEP_FILE "/sys/devices/platform/dcon/sleep" +#define DCON_FREEZE_FILE "/sys/devices/platform/dcon/freeze" static Bool dcon_present(void) @@ -53,6 +54,7 @@ DCONDPMSSet(ScrnInfoPtr pScrni, int mode) { static int failed = -1; + ssize_t ret; int fd; char value[1]; @@ -62,6 +64,25 @@ if (failed) return 0; + /* If the DCON is frozen, don't power it down, it was probably frozen + * for a reason and powering it down would corrupt the display. + * This is needed to avoid losing OLPC's frozen boot image during X + * startup, where DPMS is used to power down and up the display. + * When geode uses KMS this will not be needed as the system realises + * that no mode change is needed and the display power is untouched. */ + fd = open(DCON_FREEZE_FILE, O_RDONLY); + if (fd < 0) { + failed = 1; + return 0; + } + + ret = read(fd, value, 1); + close(fd); + if (ret == 1) { + if (value[0] == '1') + return 0; + } + fd = open(DCON_SLEEP_FILE, O_WRONLY); if (fd < 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/geode_driver.c new/xf86-video-geode-2.11.10/src/geode_driver.c --- old/xf86-video-geode-2.11.9/src/geode_driver.c 2010-08-23 07:06:51.000000000 +0200 +++ new/xf86-video-geode-2.11.10/src/geode_driver.c 2010-11-09 10:20:07.000000000 +0100 @@ -499,7 +499,7 @@ break; } } - xfree(pEnt); + free(pEnt); if (drvr_setup == NULL) return FALSE; @@ -520,9 +520,9 @@ } if (usedChips) - xfree(usedChips); + free(usedChips); if (devSections) - xfree(devSections); + free(devSections); DEBUGMSG(1, (0, X_INFO, "AmdProbe: result (%d)!\n", foundScreen)); return foundScreen; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/gx_driver.c new/xf86-video-geode-2.11.10/src/gx_driver.c --- old/xf86-video-geode-2.11.9/src/gx_driver.c 2010-08-23 07:06:51.000000000 +0200 +++ new/xf86-video-geode-2.11.10/src/gx_driver.c 2010-11-09 10:20:07.000000000 +0100 @@ -447,7 +447,7 @@ pGeode->useVGA = FALSE; #if INT10_SUPPORT - pGeode->vesa = xcalloc(sizeof(VESARec), 1); + pGeode->vesa = calloc(sizeof(VESARec), 1); #endif } @@ -960,19 +960,19 @@ XAADestroyInfoRec(pGeode->AccelInfoRec); if (pGeode->AccelImageWriteBuffers) { - xfree(pGeode->AccelImageWriteBuffers[0]); - xfree(pGeode->AccelImageWriteBuffers); + free(pGeode->AccelImageWriteBuffers[0]); + free(pGeode->AccelImageWriteBuffers); pGeode->AccelImageWriteBuffers = NULL; } if (pGeode->AccelColorExpandBuffers) { - xfree(pGeode->AccelColorExpandBuffers); + free(pGeode->AccelColorExpandBuffers); pGeode->AccelColorExpandBuffers = NULL; } if (pGeode->pExa) { exaDriverFini(pScrn); - xfree(pGeode->pExa); + free(pGeode->pExa); pGeode->pExa = NULL; } @@ -1259,10 +1259,10 @@ } } else { pGeode->AccelImageWriteBuffers = - xcalloc(sizeof(pGeode->AccelImageWriteBuffers[0]), + calloc(sizeof(pGeode->AccelImageWriteBuffers[0]), pGeode->NoOfImgBuffers); pGeode->AccelColorExpandBuffers = - xcalloc(sizeof(pGeode->AccelColorExpandBuffers[0]), + calloc(sizeof(pGeode->AccelColorExpandBuffers[0]), pGeode->NoOfColorExpandLines); } } @@ -1535,7 +1535,7 @@ GeodeFreeRec(ScrnInfoPtr pScrni) { if (pScrni->driverPrivate != NULL) { - xfree(pScrni->driverPrivate); + free(pScrni->driverPrivate); pScrni->driverPrivate = NULL; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/gx_randr.c new/xf86-video-geode-2.11.10/src/gx_randr.c --- old/xf86-video-geode-2.11.9/src/gx_randr.c 2010-08-23 07:06:51.000000000 +0200 +++ new/xf86-video-geode-2.11.10/src/gx_randr.c 2010-11-09 10:20:07.000000000 +0100 @@ -344,12 +344,12 @@ return FALSE; #endif - pRandr = xcalloc(sizeof(XF86RandRInfoRec), 1); + pRandr = calloc(sizeof(XF86RandRInfoRec), 1); if (pRandr == NULL) return FALSE; if (!RRScreenInit(pScreen)) { - xfree(pRandr); + free(pRandr); return FALSE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/gx_video.c new/xf86-video-geode-2.11.10/src/gx_video.c --- old/xf86-video-geode-2.11.9/src/gx_video.c 2010-08-23 07:06:51.000000000 +0200 +++ new/xf86-video-geode-2.11.10/src/gx_video.c 2010-11-09 10:20:07.000000000 +0100 @@ -182,7 +182,7 @@ adaptors = &newAdaptor; } else { newAdaptors = /* need to free this someplace */ - xalloc((num_adaptors + + malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *)); if (newAdaptors) { memcpy(newAdaptors, adaptors, num_adaptors * @@ -198,7 +198,7 @@ xf86XVScreenInit(pScrn, adaptors, num_adaptors); if (newAdaptors) - xfree(newAdaptors); + free(newAdaptors); } } @@ -374,7 +374,7 @@ XF86VideoAdaptorPtr adapt; GeodePortPrivRec *pPriv; - if (!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) + + if (!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + sizeof(GeodePortPrivRec) + sizeof(DevUnion)))) return NULL; @@ -1403,17 +1403,17 @@ surface->width = w; surface->height = h; - if (!(surface->pitches = xalloc(sizeof(int)))) + if (!(surface->pitches = malloc(sizeof(int)))) return BadAlloc; - if (!(surface->offsets = xalloc(sizeof(int)))) { - xfree(surface->pitches); + if (!(surface->offsets = malloc(sizeof(int)))) { + free(surface->pitches); return BadAlloc; } - if (!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) { - xfree(surface->pitches); - xfree(surface->offsets); + if (!(pPriv = malloc(sizeof(OffscreenPrivRec)))) { + free(surface->pitches); + free(surface->offsets); return BadAlloc; } @@ -1452,9 +1452,9 @@ GXStopSurface(surface); xf86FreeOffscreenArea(pPriv->area); - xfree(surface->pitches); - xfree(surface->offsets); - xfree(surface->devPrivate.ptr); + free(surface->pitches); + free(surface->offsets); + free(surface->devPrivate.ptr); return Success; } @@ -1542,7 +1542,7 @@ XF86OffscreenImagePtr offscreenImages; /* need to free this someplace */ - if (!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec)))) + if (!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec)))) return; offscreenImages[0].image = &Images[0]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/lx_display.c new/xf86-video-geode-2.11.10/src/lx_display.c --- old/xf86-video-geode-2.11.9/src/lx_display.c 2010-08-23 07:06:51.000000000 +0200 +++ new/xf86-video-geode-2.11.10/src/lx_display.c 2010-11-09 10:20:07.000000000 +0100 @@ -266,6 +266,7 @@ ScrnInfoPtr pScrni = crtc->scrn; GeodeRec *pGeode = GEODEPTR(pScrni); DF_VIDEO_SOURCE_PARAMS vs_odd, vs_even; + unsigned int rpitch; df_get_video_source_configuration(&vs_odd, &vs_even); @@ -279,6 +280,14 @@ /* The output gets turned in in the output code as * per convention */ + /* For rotation, any write to the frame buffer region marks + * the retire frame as dirty. + */ + if (crtc->rotatedData != NULL) { + rpitch = pScrni->displayWidth * (pScrni->bitsPerPixel / 8); + vg_set_display_pitch(rpitch); + } + else vg_set_display_pitch(pGeode->Pitch); gp_set_bpp(pScrni->bitsPerPixel); @@ -363,7 +372,46 @@ WRITE_VID32(DF_DISPLAY_CONFIG, dcfg); } - /* Allocates shadow memory, and allocating a new space for Rotatation. + /* The Xserver has a scratch pixmap allocation routine that will + * try to use the existing scratch pixmap if possible. When the driver + * or any other user stop using it, it need to clear out any pixmap + * state (private data etc) otherwise the next user may get stale data. + */ + + /* Use our own wrapper to allocate a pixmap for wrapping a buffer object + * It removes using scratch pixmaps for rotate. + */ +static PixmapPtr +lx_create_bo_pixmap(ScreenPtr pScreen, + int width, int height, + int depth, int bpp, + int pitch, pointer pPixData) +{ + PixmapPtr pixmap; + + pixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, depth, 0); + if (!pixmap) + return NULL; + if (!(*pScreen->ModifyPixmapHeader)(pixmap, width, height, + depth, bpp, pitch, pPixData)) { + /* ModifyPixmapHeader failed, so we can't use it as scratch pixmap + */ + (*pScreen->DestroyPixmap)(pixmap); + return NULL; + } + + return pixmap; +} + +static void +lx_destory_bo_pixmap(PixmapPtr pixmap) +{ + ScreenPtr pScreen = pixmap->drawable.pScreen; + + (*pScreen->DestroyPixmap)(pixmap); +} + + /* Allocates shadow memory, and allocating a new space for Rotation. * The size is measured in bytes, and the offset from the beginning * of card space is returned. */ @@ -422,14 +470,15 @@ lx_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height) { ScrnInfoPtr pScrni = crtc->scrn; - GeodeRec *pGeode = GEODEPTR(pScrni); PixmapPtr rpixmap; + unsigned int rpitch; + rpitch = pScrni->displayWidth * (pScrni->bitsPerPixel / 8); if (!data) data = lx_crtc_shadow_allocate(crtc, width, height); - rpixmap = GetScratchPixmapHeader(pScrni->pScreen, - width, height, pScrni->depth, pScrni->bitsPerPixel, pGeode->Pitch, + rpixmap = lx_create_bo_pixmap(pScrni->pScreen, + width, height, pScrni->depth, pScrni->bitsPerPixel, rpitch, data); if (rpixmap == NULL) { @@ -447,7 +496,7 @@ GeodeRec *pGeode = GEODEPTR(pScrni); if (rpixmap) - FreeScratchPixmapHeader(rpixmap); + lx_destory_bo_pixmap(rpixmap); /* Free shadow memory */ if (data) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/lx_driver.c new/xf86-video-geode-2.11.10/src/lx_driver.c --- old/xf86-video-geode-2.11.9/src/lx_driver.c 2010-08-23 07:06:51.000000000 +0200 +++ new/xf86-video-geode-2.11.10/src/lx_driver.c 2010-11-09 10:20:07.000000000 +0100 @@ -313,7 +313,7 @@ if (!xf86LoadSubModule(pScrni, "vgahw") || !vgaHWGetHWRec(pScrni)) pGeode->useVGA = FALSE; - pGeode->vesa = xcalloc(sizeof(VESARec), 1); + pGeode->vesa = calloc(sizeof(VESARec), 1); } cim_rdmsr = LXReadMSR; @@ -698,7 +698,7 @@ if (pGeode->pExa) { exaDriverFini(pScrn); - xfree(pGeode->pExa); + free(pGeode->pExa); pGeode->pExa = NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/lx_memory.c new/xf86-video-geode-2.11.10/src/lx_memory.c --- old/xf86-video-geode-2.11.9/src/lx_memory.c 2010-08-23 07:06:51.000000000 +0200 +++ new/xf86-video-geode-2.11.10/src/lx_memory.c 2010-11-09 10:20:07.000000000 +0100 @@ -69,7 +69,7 @@ if (ptr->next) ptr->next->prev = ptr->prev; - xfree(ptr); + free(ptr); } /* Allocate the "rest" of the offscreen memory - this is for @@ -83,7 +83,7 @@ GeodeMemPtr nptr, ptr = pGeode->offscreenList; if (!pGeode->offscreenList) { - pGeode->offscreenList = xcalloc(1, sizeof(*nptr)); + pGeode->offscreenList = calloc(1, sizeof(*nptr)); pGeode->offscreenList->offset = pGeode->offscreenStart; pGeode->offscreenList->size = pGeode->offscreenSize; pGeode->offscreenList->next = NULL; @@ -95,7 +95,7 @@ /* Go to the end of the list of allocated stuff */ for (; ptr->next; ptr = ptr->next) ; - nptr = xcalloc(1, sizeof(*nptr)); + nptr = calloc(1, sizeof(*nptr)); nptr->offset = ptr->offset + ptr->size; nptr->size = pGeode->offscreenSize - (nptr->offset - pGeode->offscreenStart); @@ -125,7 +125,7 @@ offset = ALIGN(pGeode->offscreenStart, align); - pGeode->offscreenList = xcalloc(1, sizeof(*nptr)); + pGeode->offscreenList = calloc(1, sizeof(*nptr)); pGeode->offscreenList->offset = offset; pGeode->offscreenList->size = size; pGeode->offscreenList->next = NULL; @@ -149,7 +149,7 @@ offset = ptr->offset + ptr->size; offset = ALIGN(ptr->offset + ptr->size, align); - nptr = xcalloc(1, sizeof(*nptr)); + nptr = calloc(1, sizeof(*nptr)); nptr->offset = offset; nptr->size = size; nptr->next = ptr->next; @@ -247,9 +247,6 @@ /* Get the amount of offscreen memory still left */ size = GeodeOffscreenFreeSize(pGeode); - /* Deduct the maxmimum size of a video overlay */ - size -= 0x200000; - /* Align the size to a K boundary */ size &= ~1023; @@ -307,7 +304,7 @@ while (ptr) { nptr = ptr->next; - xfree(ptr); + free(ptr); ptr = nptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/lx_output.c new/xf86-video-geode-2.11.10/src/lx_output.c --- old/xf86-video-geode-2.11.9/src/lx_output.c 2010-08-23 07:06:51.000000000 +0200 +++ new/xf86-video-geode-2.11.10/src/lx_output.c 2010-11-09 10:20:07.000000000 +0100 @@ -156,13 +156,13 @@ GeodeRec *pGeode = GEODEPTR(pScrni); /* DCON Panel specific resolution - OLPC's one */ - if (pGeode->Output & (OUTPUT_PANEL | OUTPUT_DCON)) { + if (pGeode->Output & OUTPUT_DCON) { if (pGeode->panelMode->HDisplay == 1200 && pGeode->panelMode->VDisplay == 900) return MODE_OK; } - if (pGeode->Output & OUTPUT_PANEL && + if ((pGeode->Output & OUTPUT_PANEL) && gfx_is_panel_mode_supported(pGeode->panelMode->HDisplay, pGeode->panelMode->VDisplay, pMode->HDisplay, @@ -182,7 +182,7 @@ if (pMode->type & (M_T_DRIVER | M_T_PREFERRED)) return MODE_OK; - return MODE_BAD; + return MODE_OK; } static Bool @@ -242,11 +242,17 @@ lx_output_destroy(xf86OutputPtr output) { if (output->driver_private) - xfree(output->driver_private); + free(output->driver_private); output->driver_private = NULL; } +static xf86CrtcPtr lx_output_get_crtc(xf86OutputPtr output) +{ + return output->crtc; +} + + static const xf86OutputFuncsRec lx_output_funcs = { .create_resources = lx_create_resources, .dpms = lx_output_dpms, @@ -259,6 +265,7 @@ .commit = lx_output_commit, .detect = lx_output_detect, .get_modes = lx_output_get_modes, + .get_crtc = lx_output_get_crtc, .set_property = lx_output_set_property, .destroy = lx_output_destroy, }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/lx_panel.c new/xf86-video-geode-2.11.10/src/lx_panel.c --- old/xf86-video-geode-2.11.9/src/lx_panel.c 2010-08-23 07:06:51.000000000 +0200 +++ new/xf86-video-geode-2.11.10/src/lx_panel.c 2010-11-09 10:20:07.000000000 +0100 @@ -63,12 +63,15 @@ {MODEPREFIX, 81600, 1152, 1216, 1336, 1520, 0, 864, 865, 868, 895, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX} , /* 1152x864@60 */ - {MODEPREFIX, 108000, 1028, 1328, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, + {MODEPREFIX, 108000, 1280, 1328, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX} , /* 1280x1024@60 */ {MODEPREFIX, 162000, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX} , /* 1600x1200@60 */ + {MODEPREFIX, 67630, 1024, 1080, 1184, 1344, 0, 600, 601, 604, 629, 0, + V_NHSYNC | V_NVSYNC, MODESUFFIX} + , /* 1024x600@80 */ }; /* Get the legacy panel size from VSA, and return the associated mode rec */ @@ -84,12 +87,14 @@ reg = LX_READ_VG(0x02); ret = (reg >> 3) & 0x07; - /* 7 is a "reserved" value - if we get it, we can only - * assume that a panel doesn't exist (or it hasn't been - * configured in the BIOS) + /* FIXME: 7 is reserved in default. We use this value to support + * wide screen resolution 1024x600@80 now for panel. If you want to use + * that resolution, please assign ret to 7 manually here: + * "reg = 7" + * The user can use this entry for other wide screen resolutions. */ - if (ret < 7) + if (ret < 8) return &lx_panel_modes[ret]; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/lx_video.c new/xf86-video-geode-2.11.10/src/lx_video.c --- old/xf86-video-geode-2.11.9/src/lx_video.c 2010-08-23 07:06:51.000000000 +0200 +++ new/xf86-video-geode-2.11.10/src/lx_video.c 2010-11-09 10:20:07.000000000 +0100 @@ -99,7 +99,7 @@ typedef struct { - GeodeMemPtr vidmem; + ExaOffscreenArea *vidmem; RegionRec clip; CARD32 filter; CARD32 colorKey; @@ -188,13 +188,16 @@ /* Copy planar YUV data */ static Bool -LXAllocMem(GeodeRec *pGeode, GeodePortPrivRec *pPriv, int size) +LXAllocateVidMem(ScrnInfoPtr pScrni, GeodePortPrivRec *pPriv, int size) { if (!pPriv->vidmem || pPriv->vidmem->size < size) { - if (pPriv->vidmem) - GeodeFreeOffscreen(pGeode, pPriv->vidmem); + if (pPriv->vidmem) { + exaOffscreenFree(pScrni->pScreen, pPriv->vidmem); + pPriv->vidmem = NULL; + } - pPriv->vidmem = GeodeAllocOffscreen(pGeode, size, 4); + pPriv->vidmem = exaOffscreenAlloc(pScrni->pScreen, size, 4, + TRUE, NULL, NULL); if (pPriv->vidmem == NULL) { ErrorF("Could not allocate memory for the video\n"); @@ -236,8 +239,10 @@ size = YDstPitch * height; size += UVDstPitch * height; - if (LXAllocMem(pGeode, pPriv, size) == FALSE) + if (LXAllocateVidMem(pScrni, pPriv, size) == FALSE) { + ErrorF("Error allocating an offscreen Planar region.\n"); return FALSE; + } /* The top of the source region we want to copy */ top = y1 & ~1; @@ -297,8 +302,10 @@ lines = ((dstPitch * height) + pGeode->Pitch - 1) / pGeode->Pitch; - if (LXAllocMem(pGeode, pPriv, lines) == FALSE) + if (LXAllocateVidMem(pScrni, pPriv, lines) == FALSE) { + ErrorF("Error allocating an offscreen Packed region.\n"); return FALSE; + } /* The top of the source region we want to copy */ top = y1; @@ -578,7 +585,6 @@ LXStopVideo(ScrnInfoPtr pScrni, pointer data, Bool exit) { GeodePortPrivRec *pPriv = (GeodePortPrivRec *) data; - GeodeRec *pGeode = GEODEPTR(pScrni); if (pPriv->videoStatus == 0) return; @@ -597,7 +603,7 @@ } if (pPriv->vidmem) { - GeodeFreeOffscreen(pGeode, pPriv->vidmem); + exaOffscreenFree(pScrni->pScreen, pPriv->vidmem); pPriv->vidmem = NULL; } @@ -659,7 +665,7 @@ if (pPriv->freeTime < now) { if (pPriv->vidmem) { - GeodeFreeOffscreen(pGeode, pPriv->vidmem); + exaOffscreenFree(pScrni->pScreen, pPriv->vidmem); pPriv->vidmem = NULL; } @@ -677,7 +683,7 @@ XF86VideoAdaptorPtr adapt; GeodePortPrivRec *pPriv; - adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) + + adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + sizeof(GeodePortPrivRec) + sizeof(DevUnion)); if (adapt == NULL) { @@ -742,7 +748,7 @@ struct OffscreenPrivRec { - GeodeMemPtr vidmem; + ExaOffscreenArea *vidmem; Bool isOn; }; @@ -800,7 +806,7 @@ { GeodeRec *pGeode = GEODEPTR(pScrni); int pitch, lines; - GeodeMemPtr vidmem; + ExaOffscreenArea *vidmem; struct OffscreenPrivRec *pPriv; if (w > 1024 || h > 1024) @@ -812,7 +818,8 @@ pitch = ((w << 1) + 15) & ~15; lines = ((pitch * h) + (pGeode->Pitch - 1)) / pGeode->Pitch; - vidmem = GeodeAllocOffscreen(pGeode, lines, 4); + vidmem = exaOffscreenAlloc(pScrni->pScreen, lines, 4, TRUE, + NULL, NULL); if (vidmem == NULL) { ErrorF("Error while allocating an offscreen region.\n"); @@ -822,11 +829,11 @@ surface->width = w; surface->height = h; - surface->pitches = xalloc(sizeof(int)); + surface->pitches = malloc(sizeof(int)); - surface->offsets = xalloc(sizeof(int)); + surface->offsets = malloc(sizeof(int)); - pPriv = xalloc(sizeof(struct OffscreenPrivRec)); + pPriv = malloc(sizeof(struct OffscreenPrivRec)); if (pPriv && surface->pitches && surface->offsets) { @@ -844,13 +851,15 @@ } if (surface->offsets) - xfree(surface->offsets); + free(surface->offsets); if (surface->pitches) - xfree(surface->pitches); + free(surface->pitches); - if (vidmem) - GeodeFreeOffscreen(pGeode, vidmem); + if (vidmem) { + exaOffscreenFree(pScrni->pScreen, vidmem); + vidmem = NULL; + } return BadAlloc; } @@ -871,19 +880,18 @@ struct OffscreenPrivRec *pPriv = (struct OffscreenPrivRec *) surface->devPrivate.ptr; ScrnInfoPtr pScrni = surface->pScrn; - GeodeRec *pGeode = GEODEPTR(pScrni); if (pPriv->isOn) LXStopSurface(surface); if (pPriv->vidmem) { - GeodeFreeOffscreen(pGeode, pPriv->vidmem); + exaOffscreenFree(pScrni->pScreen, pPriv->vidmem); pPriv->vidmem = NULL; } - xfree(surface->pitches); - xfree(surface->offsets); - xfree(surface->devPrivate.ptr); + free(surface->pitches); + free(surface->offsets); + free(surface->devPrivate.ptr); return Success; } @@ -908,7 +916,7 @@ XF86OffscreenImagePtr offscreenImages; /* need to free this someplace */ - if (!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec)))) + if (!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec)))) return; offscreenImages[0].image = &Images[0]; @@ -957,7 +965,7 @@ adaptors = &newAdaptor; } else { newAdaptors = - xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *)); + malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *)); if (newAdaptors) { memcpy(newAdaptors, adaptors, num_adaptors * @@ -973,5 +981,5 @@ xf86XVScreenInit(pScrn, adaptors, num_adaptors); if (newAdaptors) - xfree(newAdaptors); + free(newAdaptors); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.9/src/z4l.c new/xf86-video-geode-2.11.10/src/z4l.c --- old/xf86-video-geode-2.11.9/src/z4l.c 2010-08-23 07:06:51.000000000 +0200 +++ new/xf86-video-geode-2.11.10/src/z4l.c 2010-11-09 10:20:07.000000000 +0100 @@ -960,7 +960,7 @@ { XF86VideoEncodingPtr enc; XF86VideoEncodingPtr tencs = - (XF86VideoEncodingPtr) xrealloc(*encs, sizeof(*tencs) * (*nencs + 1)); + (XF86VideoEncodingPtr) realloc(*encs, sizeof(*tencs) * (*nencs + 1)); if (tencs == NULL) return NULL; @@ -1029,7 +1029,7 @@ l = strlen(&name[0]) + 1; l = (l + n) & ~n; n = l + sizeof(*sp); - cp = (char *)xalloc(n); + cp = (char *)malloc(n); if (cp == NULL) return 0; @@ -1055,7 +1055,7 @@ { XF86ImagePtr img; XF86ImagePtr timgs = - (XF86ImagePtr) xrealloc(*imgs, sizeof(*timgs) * (*nimgs + 1)); + (XF86ImagePtr) realloc(*imgs, sizeof(*timgs) * (*nimgs + 1)); if (timgs == NULL) return NULL; @@ -1081,7 +1081,7 @@ { XF86AttributePtr attr; XF86AttributePtr tattrs = - (XF86AttributePtr) xrealloc(*attrs, sizeof(*tattrs) * (*nattrs + 1)); + (XF86AttributePtr) realloc(*attrs, sizeof(*tattrs) * (*nattrs + 1)); if (tattrs == NULL) return NULL; @@ -1127,7 +1127,7 @@ Z4lAddAttribute(XF86AttributePtr attr, char *name, int min, int max, int flags) { - char *cp = (char *)xalloc(strlen((char *)&name[0]) + 1); + char *cp = (char *)malloc(strlen((char *)&name[0]) + 1); if (cp == NULL) return 0; @@ -1149,7 +1149,7 @@ Z4lPortPrivRec *pPriv; XF86VideoAdaptorPtr adpt, *tadpts; - tadpts = (XF86VideoAdaptorPtr *) xrealloc(*adpts, + tadpts = (XF86VideoAdaptorPtr *) realloc(*adpts, sizeof(*tadpts) * (*nadpts + 1)); if (tadpts == NULL) @@ -1158,7 +1158,7 @@ *adpts = tadpts; n = sizeof(*adpt) + sizeof(*pPriv) + 1 * sizeof(*adpt->pPortPrivates); n += (nattrs - 1) * sizeof(pPriv->attrIds[0]); - adpt = (XF86VideoAdaptorPtr) xalloc(n); + adpt = (XF86VideoAdaptorPtr) malloc(n); if (adpt == NULL) return NULL; @@ -1559,7 +1559,7 @@ has_colorkey = 1; } - dp = xalloc(strlen((char *)&capability.card[0]) + 1); + dp = malloc(strlen((char *)&capability.card[0]) + 1); if (dp == NULL) goto fail; strcpy(dp, (char *)&capability.card[0]); @@ -1668,7 +1668,7 @@ } if ((imgs = adpt->pImages) != NULL) free(imgs); - xfree(adpt); + free(adpt); } } free(adpts); ++++++ xf86-video-vmware-11.0.2.tar.bz2 -> xf86-video-vmware-11.0.3.tar.bz2 ++++++ ++++ 6567 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-control-center for openSUSE:Factory
by root＠hilbert.suse.de 10 Nov '10

10 Nov '10

Hello community, here is the log from the commit of package yast2-control-center for openSUSE:Factory checked in at Wed Nov 10 18:48:46 CET 2010. -------- --- yast2-control-center/yast2-control-center.changes 2010-03-11 14:01:48.000000000 +0100 +++ yast2-control-center/yast2-control-center.changes 2010-10-11 11:19:47.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Oct 11 11:17:55 CEST 2010 - tgoettlicher(a)suse.de + +- Adapted license format +- 2.19.3 + +------------------------------------------------------------------- +Fri Oct 8 12:32:21 CEST 2010 - tgoettlicher(a)suse.de + +- fixed: bnc #644856: wrong systemsetting category +- 2.19.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-control-center-2.19.1.tar.bz2 New: ---- yast2-control-center-2.19.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-control-center.spec ++++++ --- /var/tmp/diff_new_pack.Scs1nz/_old 2010-11-10 18:48:22.000000000 +0100 +++ /var/tmp/diff_new_pack.Scs1nz/_new 2010-11-10 18:48:22.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-control-center (Version 2.19.1) +# spec file for package yast2-control-center (Version 2.19.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,11 +18,11 @@ Name: yast2-control-center -Version: 2.19.1 +Version: 2.19.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-control-center-2.19.1.tar.bz2 +Source0: yast2-control-center-2.19.3.tar.bz2 Group: System/YaST License: GPLv2+ BuildRequires: libdrm-devel libjpeg-devel libqt4-devel pkgconfig update-desktop-files yast2-devtools ++++++ yast2-control-center-2.19.1.tar.bz2 -> yast2-control-center-2.19.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.1/VERSION.cmake new/yast2-control-center-2.19.3/VERSION.cmake --- old/yast2-control-center-2.19.1/VERSION.cmake 2010-03-11 13:58:52.000000000 +0100 +++ new/yast2-control-center-2.19.3/VERSION.cmake 2010-10-11 11:19:35.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "19") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "3") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.1/package/yast2-control-center.changes new/yast2-control-center-2.19.3/package/yast2-control-center.changes --- old/yast2-control-center-2.19.1/package/yast2-control-center.changes 2010-03-11 13:58:52.000000000 +0100 +++ new/yast2-control-center-2.19.3/package/yast2-control-center.changes 2010-10-11 11:19:35.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Mon Oct 11 11:17:55 CEST 2010 - tgoettlicher(a)suse.de + +- Adapted license format +- 2.19.3 + +------------------------------------------------------------------- +Fri Oct 8 12:32:21 CEST 2010 - tgoettlicher(a)suse.de + +- fixed: bnc #644856: wrong systemsetting category +- 2.19.2 + +------------------------------------------------------------------- Thu Mar 11 13:51:41 CET 2010 - kmachalkova(a)suse.cz - Integrate YaST with new KControl - it is ExternaApp, not KCModule diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.1/src/YaST-systemsettings.desktop new/yast2-control-center-2.19.3/src/YaST-systemsettings.desktop --- old/yast2-control-center-2.19.1/src/YaST-systemsettings.desktop 2010-03-11 13:58:52.000000000 +0100 +++ new/yast2-control-center-2.19.3/src/YaST-systemsettings.desktop 2010-10-11 11:19:35.000000000 +0200 @@ -5,5 +5,5 @@ GenericName=Administrator Settings Exec=kdesu -c /sbin/yast2 X-KDE-RootOnly=true -X-KDE-System-Settings-Parent-Category=system +X-KDE-System-Settings-Parent-Category=system-administration X-KDE-ServiceTypes=SystemSettingsExternalApp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.19.1/yast2-control-center.spec.in new/yast2-control-center-2.19.3/yast2-control-center.spec.in --- old/yast2-control-center-2.19.1/yast2-control-center.spec.in 2010-03-11 13:58:52.000000000 +0100 +++ new/yast2-control-center-2.19.3/yast2-control-center.spec.in 2010-10-11 11:19:35.000000000 +0200 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPLv2+ BuildRequires: libdrm-devel libjpeg-devel pkgconfig libqt4-devel update-desktop-files yast2-devtools BuildRequires: cmake ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-product-creator for openSUSE:Factory
by root＠hilbert.suse.de 10 Nov '10

10 Nov '10

Hello community, here is the log from the commit of package yast2-product-creator for openSUSE:Factory checked in at Wed Nov 10 18:48:05 CET 2010. -------- --- yast2-product-creator/yast2-product-creator.changes 2010-10-12 16:54:32.000000000 +0200 +++ yast2-product-creator/yast2-product-creator.changes 2010-11-09 14:41:03.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 9 14:37:48 CET 2010 - jsuchome(a)suse.cz + +- added option to build i586 images on i686 system (bnc#644895) +- 2.20.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-product-creator-2.20.2.tar.bz2 New: ---- yast2-product-creator-2.20.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.pexUZJ/_old 2010-11-10 18:45:28.000000000 +0100 +++ /var/tmp/diff_new_pack.pexUZJ/_new 2010-11-10 18:45:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-product-creator (Version 2.20.2) +# spec file for package yast2-product-creator (Version 2.20.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-product-creator -Version: 2.20.2 +Version: 2.20.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-product-creator-2.20.2.tar.bz2 +Source0: yast2-product-creator-2.20.3.tar.bz2 Prefix: /usr @@ -62,7 +62,7 @@ XEN images etc.), based on existing installation sources. %prep -%setup -n yast2-product-creator-2.20.2 +%setup -n yast2-product-creator-2.20.3 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-product-creator-2.20.2.tar.bz2 -> yast2-product-creator-2.20.3.tar.bz2 ++++++ ++++ 4597 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.20.2/VERSION new/yast2-product-creator-2.20.3/VERSION --- old/yast2-product-creator-2.20.2/VERSION 2010-10-12 15:37:47.000000000 +0200 +++ new/yast2-product-creator-2.20.3/VERSION 2010-11-09 14:38:29.000000000 +0100 @@ -1 +1 @@ -2.20.2 +2.20.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.20.2/configure.in new/yast2-product-creator-2.20.3/configure.in --- old/yast2-product-creator-2.20.2/configure.in 2010-10-12 16:53:54.000000000 +0200 +++ new/yast2-product-creator-2.20.3/configure.in 2010-01-25 19:41:40.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-product-creator, 2.20.2, http://bugs.opensuse.org/, yast2-product-creator) +AC_INIT(yast2-product-creator, 2.19.2, http://bugs.opensuse.org/, yast2-product-creator) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.20.2" +VERSION="2.19.2" RPMNAME="yast2-product-creator" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.20.2/src/Kiwi.ycp new/yast2-product-creator-2.20.3/src/Kiwi.ycp --- old/yast2-product-creator-2.20.2/src/Kiwi.ycp 2010-05-31 21:34:14.000000000 +0200 +++ new/yast2-product-creator-2.20.3/src/Kiwi.ycp 2010-11-09 14:37:24.000000000 +0100 @@ -47,6 +47,9 @@ // target architecture of image (can be only i386 if different from current one) global string image_architecture = ""; + // if target architecture should be i586 instead of i686 + global boolean target_i586 = false; + // directories with user-made templated global list<string> templates_dirs = []; @@ -566,9 +569,16 @@ } string linux32 = ""; + string target_arch = ""; // rather set target_arch only in one specific case if (Arch::architecture () == "x86_64" && ProductCreator::GetArch () == "i386") + { linux32 = "linux32"; - string cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir, linux32); + } + if (ProductCreator::GetArch () == "i386" && target_i586) + { + target_arch = "--target-arch i586"; + } + string cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --root %1 --prepare %2 --logfile terminal %4", chroot_dir, config_dir, linux32, target_arch); if (selected_profiles != "" && selected_profiles != nil) cmd = cmd + selected_profiles; @@ -615,8 +625,8 @@ // now continue with creating UI::ChangeWidget (`id(`log), `LastLine, "\n"); - cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --create %1 -d %2 --logfile terminal", - chroot_dir, out_dir, linux32); + cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --create %1 -d %2 --logfile terminal %4", + chroot_dir, out_dir, linux32, target_arch); y2milestone ("calling '%1'", cmd); // label UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image")))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.20.2/src/kiwi_dialogs.ycp new/yast2-product-creator-2.20.3/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.20.2/src/kiwi_dialogs.ycp 2010-09-30 18:20:20.000000000 +0200 +++ new/yast2-product-creator-2.20.3/src/kiwi_dialogs.ycp 2010-11-09 14:37:24.000000000 +0100 @@ -2276,11 +2276,15 @@ { arch_term = `VBox ( // checkbox label - `CheckBox (`id (`i386), `opt (`hstretch), _("&32bit Architecture Image"), + `CheckBox (`id (`i386), `opt (`notify, `hstretch), _("&32bit Architecture Image"), Kiwi::image_architecture == "i386"), `VSpacing (0.2) ); } + arch_term = add (arch_term, + // checkbox label + `CheckBox (`id (`i586), `opt (`hstretch), _("Target is i586 only"), Kiwi::target_i586)); + arch_term = add (arch_term, `VSpacing (0.2)); term contents = `VBox ( new_configuration ? @@ -2367,6 +2371,10 @@ UI::ChangeWidget (`id (`import), `Enabled, false); UI::ChangeWidget (`id (`config), `ValidChars, String::CAlnum ()+".-_"); } + if (Arch::architecture () == "x86_64") + { + UI::ChangeWidget (`id (`i586), `Enabled, Kiwi::image_architecture == "i386"); + } any ret = nil; while (true) { @@ -2395,6 +2403,10 @@ UI::ChangeWidget (`id (`template), `Enabled, false); UI::ChangeWidget (`id (`import), `Enabled, false); } + if (ret == `i386) + { + UI::ChangeWidget (`id (`i586), `Enabled, UI::QueryWidget (`id (`i386), `Value)); + } if (ret == `import) { string dir = UI::AskForExistingDirectory ( @@ -2586,6 +2598,8 @@ } } + Kiwi::target_i586 = Kiwi::image_architecture == "i386" && (boolean) UI::QueryWidget (`id (`i586), `Value); + if (size (repositories) > 0) { map<string,integer> current_sources = $[]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.20.2/src/routines.ycp new/yast2-product-creator-2.20.3/src/routines.ycp --- old/yast2-product-creator-2.20.2/src/routines.ycp 2010-03-24 08:23:29.000000000 +0100 +++ new/yast2-product-creator-2.20.3/src/routines.ycp 2010-07-29 16:44:35.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Miscelanous functions for configuration of product-creator. * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: routines.ycp 60526 2010-01-25 19:03:05Z jsuchome $ + * $Id: routines.ycp 60523 2010-01-25 19:02:45Z jsuchome $ */ { @@ -45,12 +45,15 @@ if (typemap["primary"]:"false" == "true") { task = typemap[Kiwi::content_key]:task; + if (task == "" && typemap["image"]:"" != "") + task = typemap["image"]:""; break; } }); if (task == "") { y2milestone ("no task found, setting to 'iso'"); + task = "iso"; } return task; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-slp-server for openSUSE:Factory
by root＠hilbert.suse.de 10 Nov '10

10 Nov '10

Hello community, here is the log from the commit of package yast2-slp-server for openSUSE:Factory checked in at Wed Nov 10 18:45:15 CET 2010. -------- --- yast2-slp-server/yast2-slp-server.changes 2010-06-28 16:15:48.000000000 +0200 +++ yast2-slp-server/yast2-slp-server.changes 2010-11-09 16:27:50.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 9 16:23:16 CET 2010 - mzugec(a)suse.cz + +- improved fix for bnc#291301 (write also values that wasn't readed) +- 2.20.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-slp-server-2.19.0.tar.bz2 New: ---- yast2-slp-server-2.20.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-slp-server.spec ++++++ --- /var/tmp/diff_new_pack.DePyXs/_old 2010-11-10 18:44:40.000000000 +0100 +++ /var/tmp/diff_new_pack.DePyXs/_new 2010-11-10 18:44:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-slp-server (Version 2.19.0) +# spec file for package yast2-slp-server (Version 2.20.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-slp-server -Version: 2.19.0 +Version: 2.20.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-slp-server-2.19.0.tar.bz2 +Source0: yast2-slp-server-2.20.0.tar.bz2 Prefix: /usr @@ -44,7 +44,7 @@ SLP daemon. %prep -%setup -n yast2-slp-server-2.19.0 +%setup -n yast2-slp-server-2.20.0 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-slp-server-2.19.0.tar.bz2 -> yast2-slp-server-2.20.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-server-2.19.0/VERSION new/yast2-slp-server-2.20.0/VERSION --- old/yast2-slp-server-2.19.0/VERSION 2010-06-28 16:14:34.000000000 +0200 +++ new/yast2-slp-server-2.20.0/VERSION 2010-11-09 16:23:09.000000000 +0100 @@ -1 +1 @@ -2.19.0 +2.20.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-server-2.19.0/src/SlpServer.ycp new/yast2-slp-server-2.20.0/src/SlpServer.ycp --- old/yast2-slp-server-2.19.0/src/SlpServer.ycp 2010-06-28 16:15:18.000000000 +0200 +++ new/yast2-slp-server-2.20.0/src/SlpServer.ycp 2010-11-09 16:26:58.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: SlpServer settings, input and output functions * Authors: Zugec Michal <mzugec(a)suse.cz> * - * $Id: SlpServer.ycp 62161 2010-06-28 14:15:17Z mzugec $ + * $Id: SlpServer.ycp 62788 2010-11-09 15:26:58Z mzugec $ * * Representation of the configuration of slp-server. * Input and output routines. @@ -126,54 +126,36 @@ // write global configuration file /etc/slp.conf boolean WriteGlobalConfig(){ -/* - list<string> correct_case2 = [ -"net.slp.useScopes", -"net.slp.DAAddresses", -"net.slp.isDA", -"net.slp.DAHeartBeat", -"net.slp.watchRegistrationPID", -"net.slp.maxResults", -"net.slp.isBroadcastOnly", -"net.slp.passiveDADetection", -"net.slp.activeDADetection", -"net.slp.DAActiveDiscoveryInterval", -"net.slp.multicastTTL", -"net.slp.DADiscoveryMaximumWait", -"net.slp.DADiscoveryTimeouts", -"net.slp.multicastMaximumWait", -"net.slp.multicastTimeouts", -"net.slp.unicastMaximumWait", -"net.slp.unicastTimeouts", -"net.slp.datagramTimeouts", -"net.slp.randomWaitBound", -"net.slp.MTU", -"net.slp.interfaces", -"net.slp.securityEnabled", -"net.slp.checkSourceAddr", -"net.slp.traceDATraffic", -"net.slp.traceReg", -"net.slp.traceDrop", -"net.slp.traceMsg" -]; -*/ + foreach(string k1, any v1, slp_config, { - SETTINGS["value"] = maplist(map<string, any > v2, (list < map<string, any> >) SETTINGS["value"]:nil, { + boolean found=false; + SETTINGS["value"] = maplist(map<string, any > v2, (list < map<string, any> >) SETTINGS["value"]:[], { if (k1 == v2["name"]:"") { v2["type"]= (v1 == nil) ? 0 : 1; v2["value"]=v1; + found=true; } return v2; }); + if (!found) SETTINGS["value"]=add(SETTINGS["value"]:[], + $[ + "name" : k1, + "type" : (v1 == nil) ? 0 : 1, + "kind" : "value", + "comment":"", + "value": v1 + ] + ); }); -y2internal("slp_config %1", slp_config); + y2milestone("slp_config %1", slp_config); + y2milestone("SETTINGS %1", SETTINGS); REGFILES["value"] = reg_files; - y2milestone("write reg_files %1", reg_files); - y2milestone("write REGFILES %1", REGFILES); + y2debug("write reg_files %1", reg_files); + y2debug("write REGFILES %1", REGFILES); SCR::Write(.etc.slp.all, SETTINGS); SCR::Write(.etc.slp.reg.all, REGFILES); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0