--- xf86-video-omapfb-0.1.1.orig/autogen.sh +++ xf86-video-omapfb-0.1.1/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +#$srcdir/configure --enable-maintainer-mode "$@" --- xf86-video-omapfb-0.1.1.orig/src/omapfb-driver.h +++ xf86-video-omapfb-0.1.1/src/omapfb-driver.h @@ -0,0 +1,81 @@ +/* Texas Instruments OMAP framebuffer driver for X.Org + * Copyright 2008 Kalle Vahlman, + * + * Permission to use, copy, modify, distribute and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the names of the authors and/or copyright holders + * not be used in advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. The authors and + * copyright holders make no representations about the suitability of this + * software for any purpose. It is provided "as is" without any express + * or implied warranty. + * + * THE AUTHORS AND COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR + * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef __OMAPFB_DRIVER_H__ +#define __OMAPFB_DRIVER_H__ + +#include "xf86.h" +#include "exa.h" +#include "xf86xv.h" + +#include +#include "omapfb.h" + +/* XV port */ +typedef struct { + int fd; + unsigned char *fb; + /* Non-changeable hardware info */ + struct fb_fix_screeninfo fixed_info; + /* Per-mode state info */ + struct fb_var_screeninfo state_info; + struct omapfb_mem_info mem_info; + struct omapfb_caps caps; + struct omapfb_plane_info plane_info; + struct omapfb_update_window update_window; + RegionRec current_clip; +} OMAPFBPortRec, *OMAPFBPortPtr; + +typedef struct { + int fd; + unsigned char *fb; + /* Non-changeable hardware info */ + struct fb_fix_screeninfo fixed_info; + /* Per-mode state info */ + struct fb_var_screeninfo state_info; + struct omapfb_mem_info mem_info; + struct omapfb_caps caps; + struct omapfb_plane_info plane_info; + + /* LCD controller name */ + char ctrl_name[32]; + + OMAPFBPortPtr port; + + CloseScreenProcPtr CloseScreen; + DisplayModeRec default_mode; + + ExaDriverPtr exa; +} OMAPFBRec, *OMAPFBPtr; + +#define OMAPFB(p) ((OMAPFBPtr)((p)->driverPrivate)) + +void OMAPFBPrintCapabilities(ScrnInfoPtr pScrn, + struct omapfb_caps *caps, + const char *plane_name); + +Bool OMAPFBSetupExa(OMAPFBPtr ofb); +int OMAPFBXVInit (ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **omap_adaptors); + +#endif /* __OMAPFB_DRIVER_H__ */ + --- xf86-video-omapfb-0.1.1.orig/src/image-format-conversions.h +++ xf86-video-omapfb-0.1.1/src/image-format-conversions.h @@ -0,0 +1,36 @@ +/* Image format conversions + * Copyright 2008 Kalle Vahlman, + * + * Permission to use, copy, modify, distribute and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the names of the authors and/or copyright holders + * not be used in advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. The authors and + * copyright holders make no representations about the suitability of this + * software for any purpose. It is provided "as is" without any express + * or implied warranty. + * + * THE AUTHORS AND COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR + * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef __IMAGE_FORMAT_CONVERSIONS_H__ +#define __IMAGE_FORMAT_CONVERSIONS_H__ + +#include + +/* Basic line-based copy for packed formats */ +void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest); + +/* Basic C implementation of YV12/I420 to UYVY conversion */ +void uv12_to_uyvy(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest); + +#endif /* __IMAGE_FORMAT_CONVERSIONS_H__ */ + --- xf86-video-omapfb-0.1.1.orig/src/omapfb-xv-platform.h +++ xf86-video-omapfb-0.1.1/src/omapfb-xv-platform.h @@ -0,0 +1,57 @@ +/* Texas Instruments OMAP framebuffer driver for X.Org + * Copyright 2008 Kalle Vahlman, + * + * Permission to use, copy, modify, distribute and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the names of the authors and/or copyright holders + * not be used in advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. The authors and + * copyright holders make no representations about the suitability of this + * software for any purpose. It is provided "as is" without any express + * or implied warranty. + * + * THE AUTHORS AND COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR + * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* + * This header holds definitions of platform-specific and generic XV functions + * Note that there shouldn't be any ifdefs here, ifdef in the implementation + * if it's neccessary (for eg. unsupported assembly code) + */ + +#ifndef __OMAPFB_XV_PLATFORM_H__ +#define __OMAPFB_XV_PLATFORM_H__ + +#include "omapfb-driver.h" + +enum omapfb_color_format xv_to_omapfb_format(int format); +int OMAPXVAllocPlane(ScrnInfoPtr pScrn); +int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn); + +int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, + short src_x, short src_y, short drw_x, short drw_y, + short src_w, short src_h, short drw_w, short drw_h, + int image, char *buf, short width, short height, + Bool sync, RegionPtr clipBoxes, pointer data); +int OMAPFBXVStopVideoGeneric (ScrnInfoPtr pScrn, pointer data, Bool cleanup); + +/* Blizzard is Epson S1D13745A01, found on eg. Nokia N8x0 */ +int OMAPFBXVPutImageBlizzard (ScrnInfoPtr pScrn, + short src_x, short src_y, short drw_x, short drw_y, + short src_w, short src_h, short drw_w, short drw_h, + int image, char *buf, short width, short height, + Bool sync, RegionPtr clipBoxes, pointer data); +int OMAPFBXVStopVideoBlizzard (ScrnInfoPtr pScrn, pointer data, Bool cleanup); + +#define OUTPUT_IS_OFFSCREEN (drw_x < 0 || drw_y < 0 || drw_x + drw_w > ofb->state_info.xres || drw_y + drw_h > ofb->state_info.yres) + +#endif /* __OMAPFB_XV_PLATFORM_H__ */ + --- xf86-video-omapfb-0.1.1.orig/src/omapfb.h +++ xf86-video-omapfb-0.1.1/src/omapfb.h @@ -0,0 +1,398 @@ +/* + * File: include/asm-arm/arch-omap/omapfb.h + * + * Framebuffer driver for TI OMAP boards + * + * Copyright (C) 2004 Nokia Corporation + * Author: Imre Deak + * + * 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 the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * 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., + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __OMAPFB_H +#define __OMAPFB_H + +#include +#include + +/* IOCTL commands. */ + +#define OMAP_IOW(num, dtype) _IOW('O', num, dtype) +#define OMAP_IOR(num, dtype) _IOR('O', num, dtype) +#define OMAP_IOWR(num, dtype) _IOWR('O', num, dtype) +#define OMAP_IO(num) _IO('O', num) + +#define OMAPFB_MIRROR OMAP_IOW(31, int) +#define OMAPFB_SYNC_GFX OMAP_IO(37) +#define OMAPFB_VSYNC OMAP_IO(38) +#define OMAPFB_SET_UPDATE_MODE OMAP_IOW(40, int) +#define OMAPFB_GET_CAPS OMAP_IOR(42, struct omapfb_caps) +#define OMAPFB_GET_UPDATE_MODE OMAP_IOW(43, int) +#define OMAPFB_LCD_TEST OMAP_IOW(45, int) +#define OMAPFB_CTRL_TEST OMAP_IOW(46, int) +#define OMAPFB_UPDATE_WINDOW_OLD OMAP_IOW(47, struct omapfb_update_window_old) +#define OMAPFB_SET_COLOR_KEY OMAP_IOW(50, struct omapfb_color_key) +#define OMAPFB_GET_COLOR_KEY OMAP_IOW(51, struct omapfb_color_key) +#define OMAPFB_SETUP_PLANE OMAP_IOW(52, struct omapfb_plane_info) +#define OMAPFB_QUERY_PLANE OMAP_IOW(53, struct omapfb_plane_info) +#define OMAPFB_UPDATE_WINDOW OMAP_IOW(54, struct omapfb_update_window) +#define OMAPFB_SETUP_MEM OMAP_IOW(55, struct omapfb_mem_info) +#define OMAPFB_QUERY_MEM OMAP_IOW(56, struct omapfb_mem_info) + +#define OMAPFB_CAPS_GENERIC_MASK 0x00000fff +#define OMAPFB_CAPS_LCDC_MASK 0x00fff000 +#define OMAPFB_CAPS_PANEL_MASK 0xff000000 + +#define OMAPFB_CAPS_MANUAL_UPDATE 0x00001000 +#define OMAPFB_CAPS_TEARSYNC 0x00002000 +#define OMAPFB_CAPS_PLANE_RELOCATE_MEM 0x00004000 +#define OMAPFB_CAPS_PLANE_SCALE 0x00008000 +#define OMAPFB_CAPS_WINDOW_PIXEL_DOUBLE 0x00010000 +#define OMAPFB_CAPS_WINDOW_SCALE 0x00020000 +#define OMAPFB_CAPS_WINDOW_OVERLAY 0x00040000 +#define OMAPFB_CAPS_WINDOW_ROTATE 0x00080000 +#define OMAPFB_CAPS_SET_BACKLIGHT 0x01000000 + +/* Values from DSP must map to lower 16-bits */ +#define OMAPFB_FORMAT_MASK 0x00ff +#define OMAPFB_FORMAT_FLAG_DOUBLE 0x0100 +#define OMAPFB_FORMAT_FLAG_TEARSYNC 0x0200 +#define OMAPFB_FORMAT_FLAG_FORCE_VSYNC 0x0400 +#define OMAPFB_FORMAT_FLAG_ENABLE_OVERLAY 0x0800 +#define OMAPFB_FORMAT_FLAG_DISABLE_OVERLAY 0x1000 + +#define OMAPFB_EVENT_READY 1 +#define OMAPFB_EVENT_DISABLED 2 + +#define OMAPFB_MEMTYPE_SDRAM 0 +#define OMAPFB_MEMTYPE_SRAM 1 +#define OMAPFB_MEMTYPE_MAX 1 + +enum omapfb_color_format { + OMAPFB_COLOR_RGB565 = 0, + OMAPFB_COLOR_YUV422, + OMAPFB_COLOR_YUV420, + OMAPFB_COLOR_CLUT_8BPP, + OMAPFB_COLOR_CLUT_4BPP, + OMAPFB_COLOR_CLUT_2BPP, + OMAPFB_COLOR_CLUT_1BPP, + OMAPFB_COLOR_RGB444, + OMAPFB_COLOR_YUY422, +}; + +struct omapfb_update_window { + __u32 x, y; + __u32 width, height; + __u32 format; + __u32 out_x, out_y; + __u32 out_width, out_height; + __u32 reserved[8]; +}; + +struct omapfb_update_window_old { + __u32 x, y; + __u32 width, height; + __u32 format; +}; + +enum omapfb_plane { + OMAPFB_PLANE_GFX = 0, + OMAPFB_PLANE_VID1, + OMAPFB_PLANE_VID2, +}; + +enum omapfb_channel_out { + OMAPFB_CHANNEL_OUT_LCD = 0, + OMAPFB_CHANNEL_OUT_DIGIT, +}; + +struct omapfb_plane_info { + __u32 pos_x; + __u32 pos_y; + __u8 enabled; + __u8 channel_out; + __u8 mirror; + __u8 reserved1; + __u32 out_width; + __u32 out_height; + __u32 reserved2[12]; +}; + +struct omapfb_mem_info { + __u32 size; + __u8 type; + __u8 reserved[3]; +}; + +struct omapfb_caps { + __u32 ctrl; + __u32 plane_color; + __u32 wnd_color; +}; + +enum omapfb_color_key_type { + OMAPFB_COLOR_KEY_DISABLED = 0, + OMAPFB_COLOR_KEY_GFX_DST, + OMAPFB_COLOR_KEY_VID_SRC, +}; + +struct omapfb_color_key { + __u8 channel_out; + __u32 background; + __u32 trans_key; + __u8 key_type; +}; + +enum omapfb_update_mode { + OMAPFB_UPDATE_DISABLED = 0, + OMAPFB_AUTO_UPDATE, + OMAPFB_MANUAL_UPDATE +}; + +#ifdef __KERNEL__ + +#include +#include +#include +#include + +#include + +#define OMAP_LCDC_INV_VSYNC 0x0001 +#define OMAP_LCDC_INV_HSYNC 0x0002 +#define OMAP_LCDC_INV_PIX_CLOCK 0x0004 +#define OMAP_LCDC_INV_OUTPUT_EN 0x0008 +#define OMAP_LCDC_HSVS_RISING_EDGE 0x0010 +#define OMAP_LCDC_HSVS_OPPOSITE 0x0020 + +#define OMAP_LCDC_SIGNAL_MASK 0x003f + +#define OMAP_LCDC_PANEL_TFT 0x0100 + +#define OMAPFB_PLANE_XRES_MIN 8 +#define OMAPFB_PLANE_YRES_MIN 8 + +#ifdef CONFIG_ARCH_OMAP1 +#define OMAPFB_PLANE_NUM 1 +#else +#define OMAPFB_PLANE_NUM 3 +#endif + +struct omapfb_device; + +struct lcd_panel { + const char *name; + int config; /* TFT/STN, signal inversion */ + int bpp; /* Pixel format in fb mem */ + int data_lines; /* Lines on LCD HW interface */ + + int x_res, y_res; + int pixel_clock; /* In kHz */ + int hsw; /* Horizontal synchronization + pulse width */ + int hfp; /* Horizontal front porch */ + int hbp; /* Horizontal back porch */ + int vsw; /* Vertical synchronization + pulse width */ + int vfp; /* Vertical front porch */ + int vbp; /* Vertical back porch */ + int acb; /* ac-bias pin frequency */ + int pcd; /* pixel clock divider. + Obsolete use pixel_clock instead */ + + int (*init) (struct lcd_panel *panel, + struct omapfb_device *fbdev); + void (*cleanup) (struct lcd_panel *panel); + int (*enable) (struct lcd_panel *panel); + void (*disable) (struct lcd_panel *panel); + unsigned long (*get_caps) (struct lcd_panel *panel); + int (*set_bklight_level)(struct lcd_panel *panel, + unsigned int level); + unsigned int (*get_bklight_level)(struct lcd_panel *panel); + unsigned int (*get_bklight_max) (struct lcd_panel *panel); + int (*run_test) (struct lcd_panel *panel, int test_num); +}; + +struct extif_timings { + int cs_on_time; + int cs_off_time; + int we_on_time; + int we_off_time; + int re_on_time; + int re_off_time; + int we_cycle_time; + int re_cycle_time; + int cs_pulse_width; + int access_time; + + int clk_div; + + u32 tim[5]; /* set by extif->convert_timings */ + + int converted; +}; + +struct lcd_ctrl_extif { + int (*init) (struct omapfb_device *fbdev); + void (*cleanup) (void); + void (*get_clk_info) (u32 *clk_period, u32 *max_clk_div); + unsigned long (*get_max_tx_rate)(void); + int (*convert_timings) (struct extif_timings *timings); + void (*set_timings) (const struct extif_timings *timings); + void (*set_bits_per_cycle)(int bpc); + void (*write_command) (const void *buf, unsigned int len); + void (*read_data) (void *buf, unsigned int len); + void (*write_data) (const void *buf, unsigned int len); + void (*transfer_area) (int width, int height, + void (callback)(void * data), void *data); + int (*setup_tearsync) (unsigned pin_cnt, + unsigned hs_pulse_time, unsigned vs_pulse_time, + int hs_pol_inv, int vs_pol_inv, int div); + int (*enable_tearsync) (int enable, unsigned line); + + unsigned long max_transmit_size; +}; + +struct omapfb_notifier_block { + struct notifier_block nb; + void *data; + int plane_idx; +}; + +typedef int (*omapfb_notifier_callback_t)(struct notifier_block *, + unsigned long event, + void *fbi); + +struct omapfb_mem_region { + dma_addr_t paddr; + void *vaddr; + unsigned long size; + u8 type; /* OMAPFB_PLANE_MEM_* */ + unsigned alloc:1; /* allocated by the driver */ + unsigned map:1; /* kernel mapped by the driver */ +}; + +struct omapfb_mem_desc { + int region_cnt; + struct omapfb_mem_region region[OMAPFB_PLANE_NUM]; +}; + +struct lcd_ctrl { + const char *name; + void *data; + + int (*init) (struct omapfb_device *fbdev, + int ext_mode, + struct omapfb_mem_desc *req_md); + void (*cleanup) (void); + void (*bind_client) (struct omapfb_notifier_block *nb); + void (*get_caps) (int plane, struct omapfb_caps *caps); + int (*set_update_mode)(enum omapfb_update_mode mode); + enum omapfb_update_mode (*get_update_mode)(void); + int (*setup_plane) (int plane, int channel_out, + unsigned long offset, + int screen_width, + int pos_x, int pos_y, int width, + int height, int color_mode); + int (*set_rotate) (int angle); + int (*setup_mem) (int plane, size_t size, + int mem_type, unsigned long *paddr); + int (*mmap) (struct fb_info *info, + struct vm_area_struct *vma); + int (*set_scale) (int plane, + int orig_width, int orig_height, + int out_width, int out_height); + int (*enable_plane) (int plane, int enable); + int (*update_window) (struct fb_info *fbi, + struct omapfb_update_window *win, + void (*callback)(void *), + void *callback_data); + void (*sync) (void); + void (*suspend) (void); + void (*resume) (void); + int (*run_test) (int test_num); + int (*setcolreg) (u_int regno, u16 red, u16 green, + u16 blue, u16 transp, + int update_hw_mem); + int (*set_color_key) (struct omapfb_color_key *ck); + int (*get_color_key) (struct omapfb_color_key *ck); +}; + +enum omapfb_state { + OMAPFB_DISABLED = 0, + OMAPFB_SUSPENDED= 99, + OMAPFB_ACTIVE = 100 +}; + +struct omapfb_plane_struct { + int idx; + struct omapfb_plane_info info; + enum omapfb_color_format color_mode; + struct omapfb_device *fbdev; +}; + +struct omapfb_device { + int state; + int ext_lcdc; /* Using external + LCD controller */ + struct mutex rqueue_mutex; + + int palette_size; + u32 pseudo_palette[17]; + + struct lcd_panel *panel; /* LCD panel */ + struct lcd_ctrl *ctrl; /* LCD controller */ + struct lcd_ctrl *int_ctrl; /* internal LCD ctrl */ + struct lcd_ctrl_extif *ext_if; /* LCD ctrl external + interface */ + struct device *dev; + struct fb_var_screeninfo new_var; /* for mode changes */ + + struct omapfb_mem_desc mem_desc; + struct fb_info *fb_info[OMAPFB_PLANE_NUM]; +}; + +struct omapfb_platform_data { + struct omap_lcd_config lcd; + struct omapfb_mem_desc mem_desc; + void *ctrl_platform_data; +}; + +#ifdef CONFIG_ARCH_OMAP1 +extern struct lcd_ctrl omap1_lcd_ctrl; +#else +extern struct lcd_ctrl omap2_disp_ctrl; +#endif + +extern void omapfb_reserve_sdram(void); +extern void omapfb_register_panel(struct lcd_panel *panel); +extern void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval); +extern void omapfb_notify_clients(struct omapfb_device *fbdev, + unsigned long event); +extern int omapfb_register_client(struct omapfb_notifier_block *nb, + omapfb_notifier_callback_t callback, + void *callback_data); +extern int omapfb_unregister_client(struct omapfb_notifier_block *nb); +extern int omapfb_update_window_async(struct fb_info *fbi, + struct omapfb_update_window *win, + void (*callback)(void *), + void *callback_data); + +/* in arch/arm/plat-omap/fb.c */ +extern void omapfb_set_ctrl_platform_data(void *pdata); + +#endif /* __KERNEL__ */ + +#endif /* __OMAPFB_H */ --- xf86-video-omapfb-0.1.1.orig/debian/xserver-xorg-video-omap3.links +++ xf86-video-omapfb-0.1.1/debian/xserver-xorg-video-omap3.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-omapfb/script --- xf86-video-omapfb-0.1.1.orig/debian/compat +++ xf86-video-omapfb-0.1.1/debian/compat @@ -0,0 +1 @@ +5 --- xf86-video-omapfb-0.1.1.orig/debian/copyright +++ xf86-video-omapfb-0.1.1/debian/copyright @@ -0,0 +1,28 @@ +This packages was Debianized by Riku Voipio (2008. 2009. + +This package was downloaded from +http://gitweb.pingu.fi/?p=xf86-video-omapfb.git;a=tree + + Copyright (C) 2008 Kalle Vahlman, + Copyright (C) 2004 Nokia Corporation + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +src/omapfb.h is GPLv2 and Copyright (C) 2004 Nokia Corporation --- xf86-video-omapfb-0.1.1.orig/debian/control +++ xf86-video-omapfb-0.1.1/debian/control @@ -0,0 +1,45 @@ +Source: xf86-video-omapfb +Section: x11 +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Riku Voipio +Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.9.99.903-2ubuntu1~), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, automake, libtool, xutils-dev +Standards-Version: 3.8.0 +Vcs-Git: git://git.debian.org/collab-maint/xf86-video-omapfb.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/xf86-video-omapfb.git +Homepage: http://gitweb.pingu.fi/?p=xf86-video-omapfb.git;a=tree + +Package: xserver-xorg-video-omapfb +Architecture: arm armel armeb +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} +Provides: ${xviddriver:Provides}, +Conflicts: xserver-xorg-video-omap3 +Description: X.Org X server -- Omapfb display driver + This driver for the X.Org X server (see xserver-xorg for a further + description) provides support for OMAP Framebuffer as in Nokia N8x0 and + other devices with OMAP Display Subsystem. If you have a OMAP3 or newer, + try xserver-xorg-video-omap3 for better performance. + . + More information about X.Org can be found at: + + + + . + This package is built from the X.org xf86-video-omapfb driver module. + +Package: xserver-xorg-video-omap3 +Architecture: arm armel armeb +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} +Provides: ${xviddriver:Provides}, +Conflicts: xserver-xorg-video-omapfb +Description: X.Org X server -- Omapfb display driver (NEON optimized) + This driver for the X.Org X server (see xserver-xorg for a further + description) provides support for OMAP Framebuffer with NEON optimized code + for Beagleboard and other devices based on OMAP3 or newer. + . + More information about X.Org can be found at: + + + + . + This package is built from the X.org xf86-video-omapfb driver module. --- xf86-video-omapfb-0.1.1.orig/debian/watch +++ xf86-video-omapfb-0.1.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-omap-(.*)\.tar\.gz --- xf86-video-omapfb-0.1.1.orig/debian/xserver-xorg-video-omapfb.install +++ xf86-video-omapfb-0.1.1/debian/xserver-xorg-video-omapfb.install @@ -0,0 +1 @@ +usr/lib/xorg/modules/drivers/*.so --- xf86-video-omapfb-0.1.1.orig/debian/rules +++ xf86-video-omapfb-0.1.1/debian/rules @@ -0,0 +1,126 @@ +#!/usr/bin/make -f +# debian/rules for the Debian xserver-xorg-driver-nv package. +# Copyright © 2004 Scott James Remnant +# Copyright © 2005 Daniel Stone +# Copyright © 2005 David Nusinow + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +CFLAGS = -Wall -g +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video + +serverabi: +ifeq ($(VIDEODEP),) + @echo warning: xserver-xorg-dev needs to be installed +else + echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/xserver-xorg-video-omapfb.substvars + echo "xserver:Depends=$(VIDEODEP)" >> debian/xserver-xorg-video-omapfb.substvars + echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/xserver-xorg-video-omap3.substvars + echo "xserver:Depends=$(VIDEODEP)" >> debian/xserver-xorg-video-omap3.substvars +endif + + +confflags += --disable-static + +confflags_omap3 += $(confflags) --enable-neon +CFLAGS_OMAP3 += $(CFLAGS) -mfloat-abi=softfp -mcpu=cortex-a8 -mfpu=neon + +configure: + dh_testdir + autoreconf -vfi + +obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure + dh_testdir + mkdir -p obj-$(DEB_BUILD_GNU_TYPE) + cd obj-$(DEB_BUILD_GNU_TYPE) && \ + ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info $(confflags) \ + CFLAGS="$(CFLAGS)" + +obj-omap3/config.status: configure + dh_testdir + mkdir -p obj-omap3 + cd obj-omap3 && \ + ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info $(confflags_omap3) \ + CFLAGS="$(CFLAGS_OMAP3)" + +build: build-stamp +build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status obj-omap3/config.status + dh_testdir + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + cd obj-omap3 && $(MAKE) + >$@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + rm -f config.cache config.log config.status + rm -f */config.cache */config.log */config.status + rm -f conftest* */conftest* + rm -rf autom4te.cache */autom4te.cache + rm -rf obj-* + rm -f $$(find -name Makefile.in) + rm -f compile config.guess config.sub configure depcomp install-sh + rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + cd obj-omap3 && $(MAKE) DESTDIR=$(CURDIR)/debian/xserver-xorg-video-omap3 install + rm -f $(CURDIR)/debian/xserver-xorg-video-omap3/usr/lib/xorg/modules/drivers/omapfb_drv.la + +# Build architecture-dependent files here. +binary-arch: build install serverabi + dh_testdir + dh_testroot + + dh_installdocs + dh_installchangelogs + dh_install --sourcedir=debian/tmp --list-missing --exclude=.la + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps -- --warnings=6 + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-independent files here. +binary-indep: build install +# Nothing to do + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xf86-video-omapfb-0.1.1.orig/debian/changelog +++ xf86-video-omapfb-0.1.1/debian/changelog @@ -0,0 +1,65 @@ +xf86-video-omapfb (0.1.1-3ubuntu6) natty; urgency=low + + * No-change rebuild to pick up *really* final Xserver 1.10 video ABI + + -- Christopher James Halse Rogers Tue, 15 Mar 2011 11:57:12 +1100 + +xf86-video-omapfb (0.1.1-3ubuntu5) natty; urgency=low + + * No-change rebuild to pick up final video-abi virtual package name for + Xserver 1.10 + + -- Steve Langasek Tue, 01 Mar 2011 12:44:19 -0800 + +xf86-video-omapfb (0.1.1-3ubuntu4) natty; urgency=low + + * debian/control: Build against Xserver 1.10 + + -- Christopher James Halse Rogers Tue, 01 Feb 2011 23:17:01 +1100 + +xf86-video-omapfb (0.1.1-3ubuntu3) maverick; urgency=low + + * Generate a .orig.tar.gz. This package shouldn't be native. + * Rebuild against new Xserver 1.9 ABI + + -- Christopher James Halse Rogers Tue, 10 Aug 2010 14:09:00 +1000 + +xf86-video-omapfb (0.1.1-3ubuntu2) maverick; urgency=low + + * Use new xserver dependencies. Fixes FTBFS and installability in + Maverick (LP: #608768) + * debian/rules: + * debian/control: + + Re-synchronise xsfbs fragment to match new xsfbs dependency variables + + Update dependencies for new XSF dependency world order. + + -- Christopher James Halse Rogers Fri, 23 Jul 2010 09:44:20 +0200 + +xf86-video-omapfb (0.1.1-3ubuntu1) lucid; urgency=low + + * fix hardcoded default framebuffer device to point to something that + actually exists (LP: #567260) thanks to Graeme Gregory + + -- Oliver Grawert Thu, 22 Apr 2010 16:03:28 +0200 + +xf86-video-omapfb (0.1.1-3) unstable; urgency=low + + * Make buildable with xorg 7.5 + + -- Riku Voipio Tue, 26 Jan 2010 19:28:43 +0200 + +xf86-video-omapfb (0.1.1-2) unstable; urgency=low + + * remove quilt and xsfbs.mk + * improve descriptions + * fix provides for omap3 + * upload to unstable + + -- Riku Voipio Sat, 04 Apr 2009 22:45:09 +0300 + +xf86-video-omapfb (0.1.1-1) experimental; urgency=low + + * Initial upload to debian + + -- Riku Voipio Fri, 05 Sep 2008 01:41:02 +0200 + --- xf86-video-omapfb-0.1.1.orig/debian/xserver-xorg-video-omapfb.links +++ xf86-video-omapfb-0.1.1/debian/xserver-xorg-video-omapfb.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-omapfb/script