From 0a45a1b18ab6333885eb79b0607e4dd111074513 Mon Sep 17 00:00:00 2001 From: Marko Ollonen Date: Mon, 26 Nov 2012 12:30:51 +0200 Subject: [PATCH] clean up: to_upstream.h removed. --- gst-libs/atomisphal/Makefile.am | 3 +-- gst-libs/atomisphal/to_upstream.h | 46 --------------------------------------- packaging/mfldv4l2camsrc.changes | 3 +++ packaging/mfldv4l2camsrc.spec | 1 - 4 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 gst-libs/atomisphal/to_upstream.h diff --git a/gst-libs/atomisphal/Makefile.am b/gst-libs/atomisphal/Makefile.am index 4531b2d..62987d0 100644 --- a/gst-libs/atomisphal/Makefile.am +++ b/gst-libs/atomisphal/Makefile.am @@ -11,8 +11,7 @@ libgstatomisphal_@GST_MAJORMINOR@include_HEADERS = mfld_cam.h \ gstv4l2mfldadvci.h \ atomisp_v4l2.h \ atomisp.h \ - sh_css_types.h \ - to_upstream.h + sh_css_types.h libgstatomisphal_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)\ -DSTDC99 -D__user= diff --git a/gst-libs/atomisphal/to_upstream.h b/gst-libs/atomisphal/to_upstream.h deleted file mode 100644 index df8e6a0..0000000 --- a/gst-libs/atomisphal/to_upstream.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Support for Medfield Penwell Camera Imaging ISP subsystem. - * - * Copyright (c) 2010 Intel Corporation. All Rights Reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License version - * 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - * - */ - -#ifndef _TO_UPSTREAM_H_ -#define _TO_UPSTREAM_H_ - -#include - -/* Exposoure, Flash and privacy (indicator) light controls,to be upstream */ -#define V4L2_CID_CAMERA_LASTP1 (V4L2_CID_CAMERA_CLASS_BASE + 22) - -#define V4L2_CID_ISO_ABSOLUTE (V4L2_CID_CAMERA_LASTP1 + 0) -#define V4L2_CID_APERTURE_ABSOLUTE (V4L2_CID_CAMERA_LASTP1 + 1) -#define V4L2_CID_SS_EXPOSURE_ABSOLUTE (V4L2_CID_CAMERA_LASTP1 + 2) -#define V4L2_CID_SS_ISO_ABSOLUTE (V4L2_CID_CAMERA_LASTP1 + 3) -#define V4L2_CID_SS_APERTURE_ABSOLUTE (V4L2_CID_CAMERA_LASTP1 + 4) -#define V4L2_CID_FLASH_DELAY (V4L2_CID_CAMERA_LASTP1 + 5) -#define V4L2_CID_FLASH_DURATION (V4L2_CID_CAMERA_LASTP1 + 6) - -#define V4L2_CID_FLASH_STROBE (V4L2_CID_CAMERA_CLASS_BASE + 1100) -#define V4L2_CID_FLASH_TIMEOUT (V4L2_CID_CAMERA_CLASS_BASE + 1101) -#define V4L2_CID_FLASH_INTENSITY (V4L2_CID_CAMERA_CLASS_BASE + 1102) -#define V4L2_CID_TORCH_INTENSITY (V4L2_CID_CAMERA_CLASS_BASE + 1103) -#define V4L2_CID_INDICATOR_INTENSITY (V4L2_CID_CAMERA_CLASS_BASE + 1104) -#define V4L2_CID_FLASH_TRIGGER (V4L2_CID_CAMERA_CLASS_BASE + 1105) -#define V4L2_CID_FLASH_STROBE_SENSOR (V4L2_CID_CAMERA_CLASS_BASE + 1106) - -#endif diff --git a/packaging/mfldv4l2camsrc.changes b/packaging/mfldv4l2camsrc.changes index 36b945e..ab89b0a 100644 --- a/packaging/mfldv4l2camsrc.changes +++ b/packaging/mfldv4l2camsrc.changes @@ -1,3 +1,6 @@ +* Mon Nov 26 2012 Marko Ollonen submit/trunk/20121126.084841@9943185 +- clean up: to_upstream.h removed. + * Fri Nov 23 2012 Marko Ollonen submit/trunk/20121123.104013@93e507e - af status info passing via gst_element_post_message diff --git a/packaging/mfldv4l2camsrc.spec b/packaging/mfldv4l2camsrc.spec index 37492ac..b4261f1 100644 --- a/packaging/mfldv4l2camsrc.spec +++ b/packaging/mfldv4l2camsrc.spec @@ -58,7 +58,6 @@ rm -rf %{buildroot} %exclude %{_includedir}/mfld_cam.h %exclude %{_includedir}/mfld_cam_defs.h %exclude %{_includedir}/sh_css_types.h -%exclude %{_includedir}/to_upstream.h %exclude %{_libdir}/libgstatomisphal-0.10.so %exclude %{_libdir}/libgstmfldcamera-0.10.so %exclude %{_libdir}/pkgconfig/gstreamer-atomisphal-0.10.pc -- 2.7.4