From 5f270c1ef01e33cd2799720535d1497752bf4fe7 Mon Sep 17 00:00:00 2001 From: Martijn Braam Date: Wed, 12 Jul 2023 14:51:18 +0200 Subject: [PATCH] Remove unneeded files --- config/motorola,osprey.ini | 17 ---------- config/pine64,pinephone-1.0.ini | 44 ------------------------ config/pine64,pinephone-1.1.ini | 44 ------------------------ config/pine64,pinephone-1.2.ini | 45 ------------------------- config/pine64,pinetab.ini | 42 ----------------------- config/xiaomi,scorpio.ini | 17 ---------- libmegapixels/CMakeLists.txt | 3 -- libmegapixels/findconfig.c | 60 --------------------------------- libmegapixels/meson.build | 24 ------------- 9 files changed, 296 deletions(-) delete mode 100644 config/motorola,osprey.ini delete mode 100644 config/pine64,pinephone-1.0.ini delete mode 100644 config/pine64,pinephone-1.1.ini delete mode 100644 config/pine64,pinephone-1.2.ini delete mode 100644 config/pine64,pinetab.ini delete mode 100644 config/xiaomi,scorpio.ini delete mode 100644 libmegapixels/CMakeLists.txt delete mode 100644 libmegapixels/findconfig.c delete mode 100644 libmegapixels/meson.build diff --git a/config/motorola,osprey.ini b/config/motorola,osprey.ini deleted file mode 100644 index ab8990d..0000000 --- a/config/motorola,osprey.ini +++ /dev/null @@ -1,17 +0,0 @@ -[device] -make=Motorola -model=Osprey - -[rear] -driver=imx214 -media-driver=qcom-camss -capture-width=4096 -capture-height=2304 -capture-rate=30 -capture-fmt=RGGB10P -preview-width=4096 -preview-height=2304 -preview-rate=30 -preview-fmt=RGGB10P -rotate=270 -media-links=msm_csiphy0:1->msm_csid0:0,msm_csid0:1->msm_ispif0:0,msm_ispif0:1->msm_vfe0_rdi0:0 diff --git a/config/pine64,pinephone-1.0.ini b/config/pine64,pinephone-1.0.ini deleted file mode 100644 index f4cc6f5..0000000 --- a/config/pine64,pinephone-1.0.ini +++ /dev/null @@ -1,44 +0,0 @@ -[device] -make=PINE64 -model=PinePhone - -[rear] -driver=ov5640 -media-driver=sun6i-csi -capture-width=2592 -capture-height=1944 -capture-rate=15 -capture-fmt=BGGR8 -preview-width=1280 -preview-height=720 -preview-rate=30 -preview-fmt=BGGR8 -rotate=270 -colormatrix=1.384,-0.3203,-0.0124,-0.2728,1.049,0.1556,-0.0506,0.2577,0.8050 -forwardmatrix=0.7331,0.1294,0.1018,0.3039,0.6698,0.0263,0.0002,0.0556,0.7693 -blacklevel=3 -whitelevel=255 -focallength=3.33 -cropfactor=10.81 -fnumber=3.0 -iso-min=100 -iso-max=64000 -flash-path=/sys/class/leds/white:flash - -[front] -driver=gc2145 -media-driver=sun6i-csi -capture-width=1280 -capture-height=960 -capture-rate=60 -capture-fmt=BGGR8 -preview-width=1280 -preview-height=960 -preview-rate=60 -preview-fmt=BGGR8 -rotate=90 -mirrored=true -focallength=2.6 -cropfactor=12.7 -fnumber=2.8 -flash-display=true diff --git a/config/pine64,pinephone-1.1.ini b/config/pine64,pinephone-1.1.ini deleted file mode 100644 index f4cc6f5..0000000 --- a/config/pine64,pinephone-1.1.ini +++ /dev/null @@ -1,44 +0,0 @@ -[device] -make=PINE64 -model=PinePhone - -[rear] -driver=ov5640 -media-driver=sun6i-csi -capture-width=2592 -capture-height=1944 -capture-rate=15 -capture-fmt=BGGR8 -preview-width=1280 -preview-height=720 -preview-rate=30 -preview-fmt=BGGR8 -rotate=270 -colormatrix=1.384,-0.3203,-0.0124,-0.2728,1.049,0.1556,-0.0506,0.2577,0.8050 -forwardmatrix=0.7331,0.1294,0.1018,0.3039,0.6698,0.0263,0.0002,0.0556,0.7693 -blacklevel=3 -whitelevel=255 -focallength=3.33 -cropfactor=10.81 -fnumber=3.0 -iso-min=100 -iso-max=64000 -flash-path=/sys/class/leds/white:flash - -[front] -driver=gc2145 -media-driver=sun6i-csi -capture-width=1280 -capture-height=960 -capture-rate=60 -capture-fmt=BGGR8 -preview-width=1280 -preview-height=960 -preview-rate=60 -preview-fmt=BGGR8 -rotate=90 -mirrored=true -focallength=2.6 -cropfactor=12.7 -fnumber=2.8 -flash-display=true diff --git a/config/pine64,pinephone-1.2.ini b/config/pine64,pinephone-1.2.ini deleted file mode 100644 index 7fbe760..0000000 --- a/config/pine64,pinephone-1.2.ini +++ /dev/null @@ -1,45 +0,0 @@ -[device] -make=PINE64 -model=PinePhone - -[rear] -driver=ov5640 -media-driver=sun6i-csi -capture-width=2592 -capture-height=1944 -capture-rate=15 -capture-fmt=BGGR8 -preview-width=1280 -preview-height=720 -preview-rate=30 -preview-fmt=BGGR8 -rotate=270 -mirrored=false -colormatrix=1.384,-0.3203,-0.0124,-0.2728,1.049,0.1556,-0.0506,0.2577,0.8050 -forwardmatrix=0.7331,0.1294,0.1018,0.3039,0.6698,0.0263,0.0002,0.0556,0.7693 -blacklevel=3 -whitelevel=255 -focallength=3.33 -cropfactor=10.81 -fnumber=3.0 -iso-min=100 -iso-max=64000 -flash-path=/sys/class/leds/white:flash - -[front] -driver=gc2145 -media-driver=sun6i-csi -capture-width=1280 -capture-height=960 -capture-rate=60 -capture-fmt=BGGR8 -preview-width=1280 -preview-height=960 -preview-rate=60 -preview-fmt=BGGR8 -rotate=90 -mirrored=true -focallength=2.6 -cropfactor=12.7 -fnumber=2.8 -flash-display=true diff --git a/config/pine64,pinetab.ini b/config/pine64,pinetab.ini deleted file mode 100644 index cafbb77..0000000 --- a/config/pine64,pinetab.ini +++ /dev/null @@ -1,42 +0,0 @@ -[device] -make=PINE64 -model=PinePhone - -[rear] -driver=ov5640 -media-driver=sun6i-csi -capture-width=2592 -capture-height=1944 -capture-rate=10 -capture-fmt=BGGR8 -preview-width=1280 -preview-height=720 -preview-rate=20 -preview-fmt=BGGR8 -rotate=270 -colormatrix=1.384,-0.3203,-0.0124,-0.2728,1.049,0.1556,-0.0506,0.2577,0.8050 -forwardmatrix=0.7331,0.1294,0.1018,0.3039,0.6698,0.0263,0.0002,0.0556,0.7693 -blacklevel=3 -whitelevel=255 -focallength=3.33 -cropfactor=10.81 -fnumber=3.0 -iso-min=100 -iso-max=64000 - -[front] -driver=gc2145 -media-driver=sun6i-csi -capture-width=1280 -capture-height=960 -capture-rate=30 -capture-fmt=BGGR8 -preview-width=1280 -preview-height=960 -preview-rate=30 -preview-fmt=BGGR8 -rotate=90 -mirrored=true -focallength=2.6 -cropfactor=12.7 -fnumber=2.8 diff --git a/config/xiaomi,scorpio.ini b/config/xiaomi,scorpio.ini deleted file mode 100644 index cce6d49..0000000 --- a/config/xiaomi,scorpio.ini +++ /dev/null @@ -1,17 +0,0 @@ -[device] -make=Xiaomi -model=Mi Note 2 - -[rear] -driver=imx318 -media-driver=qcom-camss -capture-width=3840 -capture-height=2160 -capture-rate=30 -capture-fmt=RGGB10P -preview-width=3840 -preview-height=2160 -preview-rate=30 -preview-fmt=RGGB10P -rotate=90 -media-links=imx318 3-001a:0->msm_csiphy0:0,msm_csiphy0:1->msm_csid0:0,msm_csid0:1->msm_ispif0:0,msm_ispif0:1->msm_vfe0_rdi0:0 diff --git a/libmegapixels/CMakeLists.txt b/libmegapixels/CMakeLists.txt deleted file mode 100644 index 95a3764..0000000 --- a/libmegapixels/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_library(megapixels SHARED libmegapixels/findconfig.c ../include/libmegapixels.h) -set_target_properties(megapixels PROPERTIES VERSION 1) -set_target_properties(megapixels PROPERTIES SOVERSION 1) \ No newline at end of file diff --git a/libmegapixels/findconfig.c b/libmegapixels/findconfig.c deleted file mode 100644 index 70fc440..0000000 --- a/libmegapixels/findconfig.c +++ /dev/null @@ -1,60 +0,0 @@ -#include -#include - -#ifndef SYSCONFDIR -#define SYSCONFDIR "/etc" -#endif -#ifndef DATADIR -#define DATADIR "/usr/share" -#endif - -static int -find_device_by_model(char *conffile, char *model) -{ - // Check config/%model.conf in the current working directory - sprintf(conffile, "config/%s.conf", model); - if (access(conffile, F_OK) != -1) { - return 1; - } - - // Check user overridden /etc/megapixels/config/%model.conf - sprintf(conffile, "%s/megapixels/config/%s.conf", SYSCONFDIR, model); - if (access(conffile, F_OK) != -1) { - return 1; - } - - // Check packaged /usr/share/megapixels/config/%model.conf - sprintf(conffile, "%s/megapixels/config/%s.conf", DATADIR, model); - if (access(conffile, F_OK) != -1) { - return 1; - } - return 0; -} - -int -libmegapixels_find_config(char *configfile) -{ - char model[512]; - FILE *fp; - - if (access("/proc/device-tree/compatible", F_OK) == -1) { - return -1; - } - fp = fopen("/proc/device-tree/compatible", "r"); - char *modelptr = model; - while (1) { - int c = fgetc(fp); - if (c == EOF) { - *(modelptr) = '\0'; - return find_device_by_model(configfile, model); - } - *(modelptr++) = (char)c; - if (c == 0) { - if (find_device_by_model(configfile, model)) { - return 0; - } - modelptr = model; - } - } - return -1; -} \ No newline at end of file diff --git a/libmegapixels/meson.build b/libmegapixels/meson.build deleted file mode 100644 index 2fc0b8a..0000000 --- a/libmegapixels/meson.build +++ /dev/null @@ -1,24 +0,0 @@ -libmegapixels_sources = [ - 'findconfig.c', -] - - -# We use libtool-version numbers because it's easier to understand. -# Before making a release, the libruntime_so_* -# numbers should be modified. The components are of the form C:R:A. -# a) If binary compatibility has been broken (eg removed or changed interfaces) -# change to C+1:0:0. -# b) If interfaces have been changed or added, but binary compatibility has -# been preserved, change to C+1:0:A+1 -# c) If the interface is the same as the previous version, change to C:R+1:A -libmegapixels_lt_c=1 -libmegapixels_lt_r=0 -libmegapixels_lt_a=0 - -libmegapixels_so_version = '@0@.@1@.@2@'.format((libmegapixels_lt_c - libmegapixels_lt_a), - libmegapixels_lt_a, - libmegapixels_lt_r) - -libmegapixels = shared_library('libmegapixels', libmegapixels_sources, - version:libmegapixels_so_version, - install: true)