debian/changelog | 6 ++++++
src/ivtv.c | 18 +++++++++---------
src/ivtv_xv.c | 8 ++++----
3 files changed, 19 insertions(+), 13 deletions(-)
New commits:
commit 798e69e3ee9d17153c5d70cca0fa7993151e4470
Author: Ian Campbell <i...@hellion.org.uk>
Date: Fri Dec 31 13:30:59 2010 +0000
Add changelog entry for 1.1.2-1
diff --git a/debian/changelog b/debian/changelog
index fc43148..16b493b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ivtvdev (1.1.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Ian Campbell <i...@hellion.org.uk> Fri, 31 Dec 2010 13:30:47 +0000
+
xserver-xorg-video-ivtvdev (1.1.1-3) experimental; urgency=low
* Build against Xserver 1.9.1 rc1.
commit ed488f869fb3220fa4e1241e696d355263cb4ff5
Author: awalls <awa...@f93e8361-94ff-0310-af1b-c9b61a63ab7d>
Date: Sun Dec 26 15:16:29 2010 +0000
Author: Ian Armstrong <i...@iarmst.demon.co.uk>
A small update to remove some now deprecated calls (xfree, xcalloc, xalloc).
Version number bumped to 1.1.2
git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/tr...@4155
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/src/ivtv.c b/src/ivtv.c
index 0888204..ede9c87 100644
--- a/src/ivtv.c
+++ b/src/ivtv.c
@@ -114,7 +114,7 @@ static int pix24bpp = 0;
#define IVTVDEV_DRIVER_NAME "ivtv"
#define IVTVDEV_VERSION_MAJOR 1
#define IVTVDEV_VERSION_MINOR 1
-#define IVTVDEV_VERSION_PATCH 1
+#define IVTVDEV_VERSION_PATCH 2
#define IVTVDEV_VERSION ((IVTVDEV_VERSION_MAJOR << 16) | \
(IVTVDEV_VERSION_MINOR << 8) | \
(IVTVDEV_VERSION_PATCH))
@@ -293,7 +293,7 @@ IVTVDevFreeRec(ScrnInfoPtr pScrn)
{
if (pScrn->driverPrivate == NULL)
return;
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
@@ -341,7 +341,7 @@ IVTVDevProbe(DriverPtr drv, int flags)
return FALSE;
if (flags & PROBE_DETECT) {
- xfree(devSections);
+ free(devSections);
TRACE("probe done");
return TRUE;
}
@@ -378,7 +378,7 @@ IVTVDevProbe(DriverPtr drv, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"using %s\n", dev ? dev : "default device");
}
- xfree(devSections);
+ free(devSections);
TRACE("probe done");
return foundScreen;
}
@@ -468,7 +468,7 @@ IVTVDevPreInit(ScrnInfoPtr pScrn, int flags)
/* handle options */
xf86CollectOptions(pScrn, NULL);
- if (!(devPtr->Options = xalloc(sizeof(IVTVDevOptions))))
+ if (!(devPtr->Options = malloc(sizeof(IVTVDevOptions))))
return FALSE;
memcpy(devPtr->Options, IVTVDevOptions, sizeof(IVTVDevOptions));
xf86ProcessOptions(pScrn->scrnIndex, devPtr->pEnt->device->options,
@@ -645,7 +645,7 @@ IVTVDevScreenInit(int scrnIndex, ScreenPtr pScreen, int
argc, char **argv)
width = pScrn->virtualX;
/* shadowfb */
- if ((devPtr->shadowmem = xcalloc(1, pScrn->virtualX * pScrn->virtualY *
+ if ((devPtr->shadowmem = calloc(1, pScrn->virtualX * pScrn->virtualY *
pScrn->bitsPerPixel)) == NULL) {
xf86DrvMsg(scrnIndex, X_ERROR,
"DevScreenInit: Allocation of shadow memory failed\n");
@@ -718,7 +718,7 @@ IVTVDevScreenInit(int scrnIndex, ScreenPtr pScreen, int
argc, char **argv)
IvtvInitVideo(pScreen);
/* Allocate buffer for yv12 to hm12 conversion */
- devPtr->xv_buffer = xalloc(622080);
+ devPtr->xv_buffer = malloc(622080);
if (!devPtr->xv_buffer) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"DevScreenInit: Failed to allocate xv conversion buffer\n");
@@ -747,11 +747,11 @@ IVTVDevCloseScreen(int scrnIndex, ScreenPtr pScreen)
ivtvHWUnmapVidmem(pScrn);
#endif
ivtvHWRestore(pScrn);
- xfree(devPtr->shadowmem);
+ free(devPtr->shadowmem);
pScrn->vtSema = FALSE;
if (devPtr->xv_buffer) {
- xfree(devPtr->xv_buffer);
+ free(devPtr->xv_buffer);
devPtr->xv_buffer = 0;
}
diff --git a/src/ivtv_xv.c b/src/ivtv_xv.c
index bc8515c..7e61677 100644
--- a/src/ivtv_xv.c
+++ b/src/ivtv_xv.c
@@ -143,7 +143,7 @@ IvtvInitVideo(ScreenPtr pScreen)
adaptors = &newAdaptor;
} else {
newAdaptors = /* need to free this someplace */
- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *));
+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *));
if (newAdaptors) {
memcpy(newAdaptors, adaptors, num_adaptors *
sizeof(XF86VideoAdaptorPtr));
@@ -158,7 +158,7 @@ IvtvInitVideo(ScreenPtr pScreen)
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
if (newAdaptors)
- xfree(newAdaptors);
+ free(newAdaptors);
}
static int
@@ -413,8 +413,8 @@ IVTVAllocAdaptor(ScreenPtr pScreen)
if (!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn)))
return NULL;
- if (!(pPriv = xcalloc(1, sizeof(DevUnion)))) {
- xfree(adapt);
+ if (!(pPriv = calloc(1, sizeof(DevUnion)))) {
+ free(adapt);
return NULL;
}
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pzto6-0002kt...@alioth.debian.org
